Skip to content

Commit

Permalink
fix remaining tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@noot
noot committed Apr 1, 2021
1 parent 8be1a2f commit 4431c38
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions dot/build_spec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dot/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dot/import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions dot/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions dot/services_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dot/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/gossamer_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down

0 comments on commit 4431c38

Please sign in to comment.