chore(tests): replace all assert.Nil(t, err) with `assert.NoError(t…

…, err)` (#2316)
ChainSafe · Feb 23, 2022 · 8022f1e · 8022f1e
1 parent 1162828
commit 8022f1e
Show file tree

Hide file tree

Showing 35 changed files with 121 additions and 121 deletions.
diff --git a/cmd/gossamer/config_test.go b/cmd/gossamer/config_test.go
@@ -65,9 +65,9 @@ func TestConfigFromChainFlag(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg.System = types.SystemInfo{}
 			require.Equal(t, c.expected, cfg)
 		})
@@ -103,9 +103,9 @@ func TestInitConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createInitConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Init)
 		})
 	}
@@ -259,9 +259,9 @@ func TestGlobalConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			require.Equal(t, c.expected, cfg.Global)
 		})
@@ -309,7 +309,7 @@ func TestGlobalConfigFromFlagsFails(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			cfg, err := createDotConfig(ctx)
 			require.NotNil(t, err)
@@ -358,9 +358,9 @@ func TestAccountConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Account)
 		})
 	}
@@ -411,9 +411,9 @@ func TestCoreConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Core)
 		})
 	}
@@ -547,9 +547,9 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.Network)
 		})
 	}
@@ -756,9 +756,9 @@ func TestRPCConfigFromFlags(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			cfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, cfg.RPC)
 		})
 	}
@@ -774,7 +774,7 @@ func TestUpdateConfigFromGenesisJSON(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), genFile, testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -809,7 +809,7 @@ func TestUpdateConfigFromGenesisJSON(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	cfg.Init.Genesis = genFile
 	updateDotConfigFromGenesisJSONRaw(*dotConfigToToml(testCfg), cfg)
@@ -828,7 +828,7 @@ func TestUpdateConfigFromGenesisJSON_Default(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), "", testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -863,7 +863,7 @@ func TestUpdateConfigFromGenesisJSON_Default(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	updateDotConfigFromGenesisJSONRaw(*dotConfigToToml(testCfg), cfg)
 	cfg.System = types.SystemInfo{}
 	require.Equal(t, expected, cfg)
@@ -878,7 +878,7 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 		[]string{"config", "genesis", "name"},
 		[]interface{}{testCfgFile.Name(), genFile, testCfg.Global.Name},
 	)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	expected := &dot.Config{
 		Global: dot.GlobalConfig{
@@ -922,24 +922,24 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 	}
 
 	cfg, err := createDotConfig(ctx)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	cfg.Init.Genesis = genFile
 
 	db, err := utils.SetupDatabase(cfg.Global.BasePath, false)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	gen, err := genesis.NewGenesisFromJSONRaw(genFile)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = state.NewBaseState(db).StoreGenesisData(gen.GenesisData())
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = db.Close()
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = updateDotConfigFromGenesisData(ctx, cfg) // name should not be updated if provided as flag value
-	require.Nil(t, err)
+	require.NoError(t, err)
 	cfg.System = types.SystemInfo{}
 	require.Equal(t, expected, cfg)
 }
@@ -991,9 +991,9 @@ func TestGlobalNodeName_WhenNodeAlreadyHasStoredName(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			createdCfg, err := createDotConfig(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 			require.Equal(t, c.expected, createdCfg.Global.Name)
 		})
 	}
@@ -1024,9 +1024,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 	c := whenNameFlagIsDefined
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(c.description, c.flags, c.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, c.expected, createdCfg.Global.Name)
 	})
 
@@ -1047,9 +1047,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 	c = whenNameIsDefinedOnTomlConfig
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(c.description, c.flags, c.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.Equal(t, c.expected, createdCfg.Global.Name)
 	})
 
@@ -1069,9 +1069,9 @@ func TestGlobalNodeNamePriorityOrder(t *testing.T) {
 
 	t.Run(c.description, func(t *testing.T) {
 		ctx, err := newTestContext(whenThereIsNoName.description, whenThereIsNoName.flags, whenThereIsNoName.values)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		createdCfg, err := createDotConfig(ctx)
-		require.Nil(t, err)
+		require.NoError(t, err)
 		require.NotEmpty(t, createdCfg.Global.Name)
 		require.NotEqual(t, cfg.Global.Name, createdCfg.Global.Name)
 	})

diff --git a/cmd/gossamer/export_test.go b/cmd/gossamer/export_test.go
@@ -160,16 +160,16 @@ func TestExportCommand(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			err = exportAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			config := ctx.GlobalString(ConfigFlag.Name)
 
 			cfg := new(ctoml.Config)
 			err = loadConfig(cfg, config)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			require.Equal(t, dotConfigToToml(c.expected), cfg)
 		})

diff --git a/cmd/gossamer/flags_test.go b/cmd/gossamer/flags_test.go
@@ -53,15 +53,15 @@ func TestFixFlagOrder(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			updatedInitAction := FixFlagOrder(initAction)
 			err = updatedInitAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			updatedExportAction := FixFlagOrder(exportAction)
 			err = updatedExportAction(ctx)
-			require.Nil(t, err)
+			require.NoError(t, err)
 		})
 	}
 }
diff --git a/cmd/gossamer/toml_config_test.go b/cmd/gossamer/toml_config_test.go
@@ -23,10 +23,10 @@ func TestLoadConfig(t *testing.T) {
 	cfg.Init.Genesis = genFile
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	err = loadConfig(dotConfigToToml(cfg), cfgFile.Name())
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.NotNil(t, cfg)
 }
 
@@ -39,13 +39,13 @@ func TestLoadConfigGssmr(t *testing.T) {
 	cfg.Init.Genesis = utils.GetGssmrGenesisPathTest(t)
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	projectRootPath := utils.GetProjectRootPathTest(t)
 	gssmrConfigPath := filepath.Join(projectRootPath, "./chain/gssmr/config.toml")
 
 	err = loadConfig(dotConfigToToml(cfg), gssmrConfigPath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.NotNil(t, cfg)
 }
 
@@ -57,11 +57,11 @@ func TestLoadConfigKusama(t *testing.T) {
 	cfg.Init.Genesis = utils.GetKusamaGenesisPath(t)
 
 	err := dot.InitNode(cfg)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	projectRootPath := utils.GetProjectRootPathTest(t)
 	kusamaConfigPath := filepath.Join(projectRootPath, "./chain/kusama/config.toml")
 
 	err = loadConfig(dotConfigToToml(cfg), kusamaConfigPath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 }
diff --git a/cmd/gossamer/utils_test.go b/cmd/gossamer/utils_test.go
@@ -122,7 +122,7 @@ func Test_setupLogger(t *testing.T) {
 		c := c // bypass scopelint false positive
 		t.Run(c.description, func(t *testing.T) {
 			ctx, err := newTestContext(c.description, c.flags, c.values)
-			require.Nil(t, err)
+			require.NoError(t, err)
 
 			_, err = setupLogger(ctx)
 			if c.expected != nil {

diff --git a/dot/core/helpers_test.go b/dot/core/helpers_test.go
@@ -73,10 +73,10 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
 		stateSrvc.UseMemDB()
 
 		err := stateSrvc.Initialise(gen, genHeader, genTrie)
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		err = stateSrvc.Start()
-		require.Nil(t, err)
+		require.NoError(t, err)
 	}
 
 	if cfg.BlockState == nil {

diff --git a/dot/core/service_integration_test.go b/dot/core/service_integration_test.go
@@ -152,9 +152,9 @@ func TestService_InsertKey(t *testing.T) {
 			err := s.InsertKey(kr.Alice(), c.keystoreType)
 
 			if c.err == nil {
-				require.Nil(t, err)
+				require.NoError(t, err)
 				res, err := s.HasKey(kr.Alice().Public().Hex(), c.keystoreType)
-				require.Nil(t, err)
+				require.NoError(t, err)
 				require.True(t, res)
 			} else {
 				require.NotNil(t, err)