From 4431c38c9978c9bbc77bec8bb21888a776e098e0 Mon Sep 17 00:00:00 2001 From: noot Date: Thu, 1 Apr 2021 14:52:38 -0400 Subject: [PATCH] fix remaining tests --- dot/build_spec_test.go | 4 ++-- dot/config_test.go | 2 +- dot/import_test.go | 2 +- dot/node_test.go | 16 ++++++++-------- dot/services_test.go | 18 +++++++++--------- dot/utils_test.go | 2 +- tests/utils/gossamer_utils.go | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dot/build_spec_test.go b/dot/build_spec_test.go index c49c74ca4b..98dea7b16b 100644 --- a/dot/build_spec_test.go +++ b/dot/build_spec_test.go @@ -53,8 +53,8 @@ func TestBuildFromGenesis(t *testing.T) { func TestBuildFromDB(t *testing.T) { // setup expected cfg := NewTestConfig(t) - cfg.Init.GenesisRaw = "../chain/gssmr/genesis.json" - expected, err := genesis.NewGenesisFromJSONRaw(cfg.Init.GenesisRaw) + cfg.Init.Genesis = "../chain/gssmr/genesis.json" + expected, err := genesis.NewGenesisFromJSONRaw(cfg.Init.Genesis) require.NoError(t, err) // initialize node (initialize state database and load genesis data) err = InitNode(cfg) diff --git a/dot/config_test.go b/dot/config_test.go index 70f2fe1abf..194a1cbf38 100644 --- a/dot/config_test.go +++ b/dot/config_test.go @@ -34,7 +34,7 @@ func TestExportConfig(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) diff --git a/dot/import_test.go b/dot/import_test.go index 3f6e526bd4..b70a63a9df 100644 --- a/dot/import_test.go +++ b/dot/import_test.go @@ -99,7 +99,7 @@ func TestImportState(t *testing.T) { genFile := NewTestGenesisRawFile(t, cfg) require.NotNil(t, genFile) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() cfg.Global.BasePath = basepath err = InitNode(cfg) diff --git a/dot/node_test.go b/dot/node_test.go index 7183597f3e..261636c73c 100644 --- a/dot/node_test.go +++ b/dot/node_test.go @@ -51,7 +51,7 @@ func TestInitNode(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.NoError(t, err) @@ -67,7 +67,7 @@ func TestNodeInitialized(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() expected := NodeInitialized(cfg.Global.BasePath, false) require.Equal(t, expected, false) @@ -89,7 +89,7 @@ func TestNewNode(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.NoError(t, err) @@ -121,7 +121,7 @@ func TestNewNode_Authority(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.NoError(t, err) @@ -157,7 +157,7 @@ func TestStartNode(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() cfg.Core.GrandpaAuthority = false err := InitNode(cfg) @@ -194,7 +194,7 @@ func TestInitNode_LoadGenesisData(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genPath + cfg.Init.Genesis = genPath cfg.Core.GrandpaAuthority = false err := InitNode(cfg) @@ -257,7 +257,7 @@ func TestInitNode_LoadStorageRoot(t *testing.T) { cfg.Core.Roles = types.FullNodeRole cfg.Core.BabeAuthority = false cfg.Core.GrandpaAuthority = false - cfg.Init.GenesisRaw = genPath + cfg.Init.Genesis = genPath gen, err := genesis.NewGenesisFromJSONRaw(genPath) require.NoError(t, err) @@ -313,7 +313,7 @@ func TestInitNode_LoadBalances(t *testing.T) { cfg.Core.GrandpaAuthority = false cfg.Core.BabeThresholdNumerator = 0 cfg.Core.BabeThresholdDenominator = 0 - cfg.Init.GenesisRaw = genPath + cfg.Init.Genesis = genPath err := InitNode(cfg) require.NoError(t, err) diff --git a/dot/services_test.go b/dot/services_test.go index 31f4f99438..91f55d2d09 100644 --- a/dot/services_test.go +++ b/dot/services_test.go @@ -41,7 +41,7 @@ func TestCreateStateService(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -67,7 +67,7 @@ func TestCreateCoreService(t *testing.T) { cfg.Core.Roles = types.FullNodeRole cfg.Core.BabeAuthority = false cfg.Core.GrandpaAuthority = false - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.NoError(t, err) @@ -107,7 +107,7 @@ func TestCreateBlockVerifier(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -130,7 +130,7 @@ func TestCreateSyncService(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -162,7 +162,7 @@ func TestCreateNetworkService(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -191,7 +191,7 @@ func TestCreateRPCService(t *testing.T) { cfg.Core.Roles = types.FullNodeRole cfg.Core.BabeAuthority = false cfg.Core.GrandpaAuthority = false - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -235,7 +235,7 @@ func TestCreateBABEService(t *testing.T) { // TODO: improve dot tests #687 cfg.Core.Roles = types.FullNodeRole - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.Nil(t, err) @@ -267,7 +267,7 @@ func TestCreateGrandpaService(t *testing.T) { // TODO: improve dot tests #687 cfg.Core.Roles = types.AuthorityRole - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() err := InitNode(cfg) require.NoError(t, err) @@ -315,7 +315,7 @@ func TestNewWebSocketServer(t *testing.T) { cfg.Core.Roles = types.FullNodeRole cfg.Core.BabeAuthority = false cfg.Core.GrandpaAuthority = false - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() cfg.RPC.External = false cfg.RPC.WS = true cfg.RPC.WSExternal = false diff --git a/dot/utils_test.go b/dot/utils_test.go index 657b630c79..a715d27ffa 100644 --- a/dot/utils_test.go +++ b/dot/utils_test.go @@ -61,7 +61,7 @@ func TestNewTestGenesis(t *testing.T) { defer utils.RemoveTestDir(t) - cfg.Init.GenesisRaw = genFile.Name() + cfg.Init.Genesis = genFile.Name() } func TestNewTestGenesisFile(t *testing.T) { diff --git a/tests/utils/gossamer_utils.go b/tests/utils/gossamer_utils.go index 70f086c66d..2511dfd029 100644 --- a/tests/utils/gossamer_utils.go +++ b/tests/utils/gossamer_utils.go @@ -433,7 +433,7 @@ func generateDefaultConfig() *ctoml.Config { SyncLvl: "info", }, Init: ctoml.InitConfig{ - GenesisRaw: "./chain/gssmr/genesis.json", + Genesis: "./chain/gssmr/genesis.json", }, Account: ctoml.AccountConfig{ Key: "",