fix: cleanup and fixes

gnolang · Feb 19, 2025 · f3767e5 · f3767e5
1 parent ba098cd
commit f3767e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/tm2/pkg/bft/config/toml.go b/tm2/pkg/bft/config/toml.go
@@ -87,7 +87,7 @@ func ResetTestRoot(testName string) (*Config, string) {
 	// behaviour, we place genesis.json in the rootDir.
 	genesisFilePath := filepath.Join(rootDir, "genesis.json")
 	privvalConfig := privval.DefaultPrivValidatorConfig()
-	privvalConfig.RootDir = rootDir
+	privvalConfig.RootDir = filepath.Join(rootDir, DefaultSecretsDir)
 
 	// Write default config file if missing.
 	if !osm.FileExists(configFilePath) {
@@ -129,12 +129,12 @@ var testPrivValidatorKey = `{
   "priv_key": {
     "@type": "/tm.PrivKeyEd25519",
     "value": "Qq4Q9QH2flPSIJShbXPIocbrQtQ4S7Kdn31uI3sKZoJxW3rDcLUNZjDCQCKuduwvj0Kg57xPxlHYEIHwx44ZGA=="
-  }
+  },
   "pub_key": {
     "@type": "/tm.PubKeyEd25519",
     "value": "cVt6w3C1DWYwwkAirnbsL49CoOe8T8ZR2BCB8MeOGRg="
   },
-  "address": "g1uvwz22t0l2fv9az93wutmlusrjv5zdwx2n32d5",
+  "address": "g1uvwz22t0l2fv9az93wutmlusrjv5zdwx2n32d5"
 }`
 
 var testPrivValidatorState = `{

diff --git a/tm2/pkg/bft/config/toml_test.go b/tm2/pkg/bft/config/toml_test.go
@@ -70,8 +70,8 @@ func TestEnsureTestRoot(t *testing.T) {
 		rootDir,
 		"genesis.json",
 		DefaultDBDir,
-		baseConfig.PrivValidator.SignStatePath(),
 		baseConfig.PrivValidator.LocalSignerPath(),
+		baseConfig.PrivValidator.SignStatePath(),
 	)
 }
 

diff --git a/tm2/pkg/sdk/baseapp.go b/tm2/pkg/sdk/baseapp.go
@@ -608,14 +608,13 @@ func (app *BaseApp) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDeliv
 
 // validateBasicTxMsgs executes basic validator calls for messages.
 func validateBasicTxMsgs(msgs []Msg) error {
-	if msgs == nil || len(msgs) == 0 {
+	if len(msgs) == 0 {
 		return std.ErrUnknownRequest("Tx.GetMsgs() must return at least one message in list")
 	}
 
 	for _, msg := range msgs {
 		// Validate the Msg.
-		err := msg.ValidateBasic()
-		if err != nil {
+		if err := msg.ValidateBasic(); err != nil {
 			return err
 		}
 	}