fix(transcation):#195 remove global variables

zboxcore/conf/conf.go → core/conf/conf.go

@@ -14,14 +14,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-var (
-	// DefaultConfigFileName default config file in ~/.zcn
-	DefaultConfigFileName = "config.yaml"
-
-	// Config current config instance for zbox
-	Config ZConfig
-)
-
 var (
 	// ErrMssingConfig config file is missing
 	ErrMssingConfig = errors.New("[conf]missing config file")
@@ -31,43 +23,28 @@ var (
 	ErrBadFormat = errors.New("[conf]bad format")
 )
 
-func init() {
-	LoadDefault()
-}
-
 // LoadDefault load and parse config from ~/.zcn/config.yaml
-func LoadDefault() error {
-	return Load(DefaultConfigFileName)
+func LoadDefault() (Config, error) {
+	return Load("config.yaml")
 }
 
 // Load load and parse config file in ~/.zcn folder. it is ~/.zcn/config.yaml if file is invalid.
 // Example:
 //   conf.Load("stream.yaml"), it will load settings from ~/.zcn/stream.yaml
-func Load(fileName string) error {
+func Load(fileName string) (Config, error) {
+
+	var cfg Config
+
 	file := path.Join(getConfigDir(), fileName)
 	_, err := os.Stat(file)
 
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			return thrown.Throw(ErrMssingConfig, err.Error())
+			return cfg, thrown.Throw(ErrMssingConfig, err.Error())
 		}
-		return err
+		return cfg, err
 	}
 
-	cfg, err := loadConfigFile(file)
-
-	if err != nil {
-		return err
-	}
-
-	Config = cfg
-	return nil
-}
-
-func loadConfigFile(file string) (ZConfig, error) {
-
-	var cfg ZConfig
-
 	v := viper.New()
 
 	v.SetConfigFile(file)
@@ -85,9 +62,7 @@ func loadConfigFile(file string) (ZConfig, error) {
 	minSubmit := v.GetInt("min_submit")
 
 	if minSubmit < 1 {
-		minSubmit = 50
-	} else if minSubmit > 100 {
-		minSubmit = 100
+		minSubmit = 3
 	}
 
 	minCfm := v.GetInt("min_confirmation")

zboxcore/conf/conf_test.go → core/conf/conf_test.go

@@ -22,7 +22,7 @@ func TestMissingConfig(t *testing.T) {
 
 	configFile := "missing_config.yaml"
 
-	err := Load(configFile)
+	_, err := Load(configFile)
 
 	require.ErrorIs(t, err, ErrMssingConfig)
 }
@@ -36,7 +36,7 @@ func TestBadFormat(t *testing.T) {
 `)
 	defer tearDownConfig("bad_format.yaml")
 
-	err := Load("bad_format.yaml")
+	_, err := Load("bad_format.yaml")
 
 	require.ErrorIs(t, err, ErrBadFormat)
 }
@@ -48,7 +48,7 @@ block_worker: 127.0.0.1:9091
 `)
 	defer tearDownConfig("invalid_blockworker.yaml")
 
-	err := Load("invalid_blockworker.yaml")
+	_, err := Load("invalid_blockworker.yaml")
 
 	require.ErrorIs(t, err, ErrInvalidValue)
 }

zboxcore/conf/config.go → core/conf/config.go

@@ -1,6 +1,6 @@
 package conf
 
-// ZConfig settings from ~/.zcn/config.yaml
+// Config settings from ~/.zcn/config.yaml
 // block_worker: http://198.18.0.98:9091
 // signature_scheme: bls0chain
 // min_submit: 50
@@ -13,7 +13,7 @@ package conf
 // #   - http://one.devnet-0chain.net:31051
 // #   - http://one.devnet-0chain.net:31052
 // #   - http://one.devnet-0chain.net:31053
-type ZConfig struct {
+type Config struct {
 	// BlockWorker the url of 0dns's network api
 	BlockWorker string
 	// PreferredBlobbers preferred blobbers on new allocation

zboxcore/conf/network.go → core/conf/network.go

@@ -1,7 +1,7 @@
 package conf
 
-// ZNetwork settings from ~/.zcn/network.yaml
-type ZNetwork struct {
+// Network settings from ~/.zcn/network.yaml
+type Network struct {
 	// Sharders sharder list of blockchain
 	Sharders []string
 	// Miners miner list of blockchain

core/transaction/entity.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/0chain/errors"
 	"github.com/0chain/gosdk/core/common"
+	"github.com/0chain/gosdk/core/conf"
 	"github.com/0chain/gosdk/core/encryption"
 	"github.com/0chain/gosdk/core/util"
-	"github.com/0chain/gosdk/zboxcore/conf"
 )
 
 const TXN_SUBMIT_URL = "v1/transaction/put"
@@ -206,7 +206,7 @@ func sendTransactionToURL(url string, txn *Transaction, wg *sync.WaitGroup) ([]b
 }
 
 // VerifyTransaction query transaction status from sharders, and verify it by mininal confirmation
-func VerifyTransaction(txnHash string, sharders []string) (*Transaction, error) {
+func VerifyTransaction(txnHash string, sharders []string, cfg conf.Config) (*Transaction, error) {
 	numSharders := len(sharders)
 
 	if numSharders == 0 {
@@ -274,7 +274,7 @@ func VerifyTransaction(txnHash string, sharders []string) (*Transaction, error)
 
 	consensus := int(float64(numSuccess) / float64(numSharders) * 100)
 
-	if consensus > 0 && consensus >= conf.Config.MinConfirmation {
+	if consensus > 0 && consensus >= cfg.MinConfirmation {
 
 		if retTxn == nil {
 			return nil, errors.Throw(ErrNoTxnDetail, strings.Join(msgList, "\r\n"))
@@ -283,7 +283,7 @@ func VerifyTransaction(txnHash string, sharders []string) (*Transaction, error)
 		return retTxn, nil
 	}
 
-	msgList[0] = fmt.Sprintf("want %v, but got %v ", conf.Config.MinConfirmation, consensus)
+	msgList[0] = fmt.Sprintf("want %v, but got %v ", cfg.MinConfirmation, consensus)
 
 	return nil, errors.Throw(ErrTooLessConfirmation, strings.Join(msgList, "\r\n"))