Merge pull request #31 from alex-semenyuk/remove_blockchain_rpc

Remove explicit setting default connector.blockchain.rpc at code

Author: denisandreenko

cmd/tezosconnect_test.go

@@ -2,72 +2,42 @@ package cmd
 
 import (
 	"context"
-	"os"
 	"testing"
 	"time"
 
-	"github.com/hyperledger/firefly-common/pkg/config"
-	"github.com/hyperledger/firefly-tezosconnect/internal/tezos"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRun(t *testing.T) {
+	InitConfig()
 	testCases := []struct {
-		name        string
-		errMsg      string
-		initFunc    func()
-		cleanupFunc func()
+		name    string
+		errMsg  string
+		cfgFile string
 	}{
 		{
-			name: "success",
-			initFunc: func() {
-				f, err := os.Create("firefly.tezosconnect")
-				assert.NoError(t, err)
-				err = f.Close()
-				assert.NoError(t, err)
-
-				dir, err := os.MkdirTemp("", "ldb_*")
-				assert.NoError(t, err)
-				config.Set("persistence.leveldb.path", dir)
-			},
-			cleanupFunc: func() {
-				err := os.Remove("firefly.tezosconnect")
-				assert.NoError(t, err)
-			},
+			name:    "success",
+			cfgFile: "../test/firefly.tezosconnect.yaml",
 		},
 		{
-			name:        "error on config not found",
-			initFunc:    func() {},
-			cleanupFunc: func() {},
-			errMsg:      "FF00101: Failed to read config: Config File \"firefly.tezosconnect\" Not Found",
+			name:    "error on config not found",
+			cfgFile: "../test/missing.firefly.tezosconnect.yaml",
+			errMsg:  "FF00101",
 		},
 		{
-			name: "error on NewTezosConnector",
-			initFunc: func() {
-				f, err := os.Create("firefly.tezosconnect")
-				assert.NoError(t, err)
-				err = f.Close()
-				assert.NoError(t, err)
-
-				connectorConfig.Set(tezos.TxCacheSize, "-1")
-			},
-			cleanupFunc: func() {
-				err := os.Remove("firefly.tezosconnect")
-				assert.NoError(t, err)
-			},
-			errMsg: "FF23040: Failed to initialize transaction cache: Must provide a positive size",
+			name:    "error on NewTezosConnector",
+			cfgFile: "../test/firefly.tezosconnect-without-connector.yaml",
+			errMsg:  "FF23051",
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tc.initFunc()
+			cfgFile = tc.cfgFile
 			ctx, cancelCtx := context.WithTimeout(context.Background(), time.Second)
 
 			err := run(ctx, cancelCtx)
 
-			tc.cleanupFunc()
-
 			if tc.errMsg != "" {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), tc.errMsg)

config.md

@@ -88,7 +88,7 @@
 |Key|Description|Type|Default Value|
 |---|-----------|----|-------------|
 |network|Tezos network, by default - mainnet (mainnet | ghostnet | nairobinet)|string|`mainnet`
-|rpc|URL of the Tezos RPC node|string|`https://rpc.tzstats.com`
+|rpc|URL of the Tezos RPC node|string|`<nil>`
 |signatory|URL of the signatory service for remote tx signing|string|`<nil>`
 
 ## connector.events

internal/tezos/config.go

@@ -52,7 +52,7 @@ func InitConfig(conf config.Section) {
 	conf.AddKnownKey(RetryInitDelay, DefaultRetryInitDelay)
 	conf.AddKnownKey(RetryMaxDelay, DefaultRetryMaxDelay)
 	conf.AddKnownKey(TxCacheSize, 250)
-	conf.AddKnownKey(BlockchainRPC, "https://rpc.tzstats.com")
+	conf.AddKnownKey(BlockchainRPC)
 	conf.AddKnownKey(BlockchainNetwork, "mainnet")
 	conf.AddKnownKey(BlockchainSignatory)
 }

internal/tezos/tezos_test.go

@@ -15,6 +15,7 @@ func newTestConnector(t *testing.T) (context.Context, *tezosConnector, *tzrpcbac
 	config.RootConfigReset()
 	conf := config.RootSection("unittest")
 	InitConfig(conf)
+	conf.AddKnownKey(BlockchainRPC, "https://ghostnet.example.com")
 	logrus.SetLevel(logrus.DebugLevel)
 	ctx, done := context.WithCancel(context.Background())
 	cc, err := NewTezosConnector(ctx, conf)

test/firefly.tezosconnect-without-connector.yaml

@@ -0,0 +1,3 @@
+persistence:
+  leveldb:
+    path: ./.leveldb

test/firefly.tezosconnect.yaml

@@ -0,0 +1,6 @@
+connector:
+  blockchain:
+    rpc: https://ghostnet.example.com
+persistence:
+  leveldb:
+    path: ./.leveldb