keep single encoding config in the application

babylonchain · Feb 17, 2023 · 9140ef2 · 9140ef2
1 parent c92e948
commit 9140ef2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/test_helpers.go b/app/test_helpers.go
@@ -13,13 +13,12 @@ import (
 	"cosmossdk.io/math"
 	tmconfig "github.com/tendermint/tendermint/config"
 
+	tmjson "github.com/tendermint/tendermint/libs/json"
+
 	"github.com/babylonchain/babylon/app/params"
 	appparams "github.com/babylonchain/babylon/app/params"
 	"github.com/babylonchain/babylon/testutil/datagen"
-	tmjson "github.com/tendermint/tendermint/libs/json"
 
-	txformat "github.com/babylonchain/babylon/btctxformatter"
-	bbn "github.com/babylonchain/babylon/types"
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -43,6 +42,9 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmtypes "github.com/tendermint/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
+
+	txformat "github.com/babylonchain/babylon/btctxformatter"
+	bbn "github.com/babylonchain/babylon/types"
 )
 
 // DefaultConsensusParams defines the default Tendermint consensus params used in
@@ -242,7 +244,8 @@ func SetupPrivSigner() (*PrivSigner, error) {
 	if err != nil {
 		return nil, err
 	}
-	privSigner, _ := InitPrivSigner(client.Context{}, ".", kr)
+	encodingCfg := appparams.MakeTestEncodingConfig()
+	privSigner, _ := InitPrivSigner(client.Context{}, ".", kr, encodingCfg)
 	privSigner.WrappedPV.Clean(nodeCfg.PrivValidatorKeyFile(), nodeCfg.PrivValidatorStateFile())
 	return privSigner, nil
 }

diff --git a/app/utils.go b/app/utils.go
@@ -16,6 +16,7 @@ import (
 	tmconfig "github.com/tendermint/tendermint/config"
 	tmos "github.com/tendermint/tendermint/libs/os"
 
+	appparams "github.com/babylonchain/babylon/app/params"
 	"github.com/babylonchain/babylon/privval"
 )
 
@@ -43,7 +44,7 @@ type PrivSigner struct {
 	ClientCtx client.Context
 }
 
-func InitPrivSigner(clientCtx client.Context, nodeDir string, kr keyring.Keyring) (*PrivSigner, error) {
+func InitPrivSigner(clientCtx client.Context, nodeDir string, kr keyring.Keyring, encodingCfg appparams.EncodingConfig) (*PrivSigner, error) {
 	// setup private validator
 	nodeCfg := tmconfig.DefaultConfig()
 	pvKeyFile := filepath.Join(nodeDir, nodeCfg.PrivValidatorKeyFile())
@@ -60,7 +61,6 @@ func InitPrivSigner(clientCtx client.Context, nodeDir string, kr keyring.Keyring
 
 	// TODO this should probably not create separate config, but rahter accept it
 	// as argument
-	encodingCfg := MakeTestEncodingConfig()
 	clientCtx = clientCtx.
 		WithInterfaceRegistry(encodingCfg.InterfaceRegistry).
 		WithCodec(encodingCfg.Marshaler).

diff --git a/cmd/babylond/cmd/root.go b/cmd/babylond/cmd/root.go
@@ -274,7 +274,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a
 	if err != nil {
 		panic(err)
 	}
-	privSigner, err := app.InitPrivSigner(clientCtx, homeDir, clientCtx.Keyring)
+	privSigner, err := app.InitPrivSigner(clientCtx, homeDir, clientCtx.Keyring, a.encCfg)
 	if err != nil {
 		panic(err)
 	}
@@ -337,7 +337,7 @@ func (a appCreator) appExport(
 		panic(err)
 	}
 
-	privSigner, err := app.InitPrivSigner(clientCtx, homePath, kr)
+	privSigner, err := app.InitPrivSigner(clientCtx, homePath, kr, a.encCfg)
 	if err != nil {
 		panic(err)
 	}