remove test encoding config

app/app_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestBabylonBlockedAddrs(t *testing.T) {
- encCfg := MakeTestEncodingConfig()
+ encCfg := MakeEncodingConfig()
  db := dbm.NewMemDB()
  signer, _ := SetupPrivSigner()
  logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
@@ -48,7 +48,7 @@ func TestGetMaccPerms(t *testing.T) {
 }
 
 func TestUpgradeStateOnGenesis(t *testing.T) {
- encCfg := MakeTestEncodingConfig()
+ encCfg := MakeEncodingConfig()
  db := dbm.NewMemDB()
  privSigner, err := SetupPrivSigner()
  require.NoError(t, err)

app/encoding.go

@@ -1,16 +1,20 @@
 package app
 
 import (
- appparams "github.com/babylonchain/babylon/app/params"
  "github.com/cosmos/cosmos-sdk/std"
+
+ appparams "github.com/babylonchain/babylon/app/params"
 )
 
-// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
-// should be used only in tests or when creating a new app instance (NewApp*()).
-// App user shouldn't create new codecs - use the app.AppCodec instead.
-// [DEPRECATED]
-func MakeTestEncodingConfig() appparams.EncodingConfig {
- encodingConfig := appparams.MakeTestEncodingConfig()
+var encodingConfig appparams.EncodingConfig = MakeEncodingConfig()
+
+func GetEncodingConfig() appparams.EncodingConfig {
+ return encodingConfig
+}
+
+// MakeEncodingConfig creates an EncodingConfig.
+func MakeEncodingConfig() appparams.EncodingConfig {
+ encodingConfig := appparams.MakeEncodingConfig()
  std.RegisterLegacyAminoCodec(encodingConfig.Amino)
  std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
  ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)

app/modules.go

@@ -23,5 +23,5 @@ func (app *BabylonApp) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
 }
 
 func (app *BabylonApp) GetTxConfig() client.TxConfig {
- return MakeTestEncodingConfig().TxConfig
+ return MakeEncodingConfig().TxConfig
 }

app/params/proto.go

@@ -9,19 +9,17 @@ import (
  "github.com/cosmos/cosmos-sdk/x/auth/tx"
 )
 
-// MakeTestEncodingConfig creates an EncodingConfig for a non-amino based test configuration.
-// This function should be used only internally (in the SDK).
-// App user should'nt create new codecs - use the app.AppCodec instead.
-// [DEPRECATED]
-func MakeTestEncodingConfig() EncodingConfig {
- cdc := codec.NewLegacyAmino()
+// MakeEncodingConfig creates an EncodingConfig for an amino based test configuration.
+func MakeEncodingConfig() EncodingConfig {
+ amino := codec.NewLegacyAmino()
  interfaceRegistry := types.NewInterfaceRegistry()
  marshaler := codec.NewProtoCodec(interfaceRegistry)
+ txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes)
 
  return EncodingConfig{
  InterfaceRegistry: interfaceRegistry,
  Marshaler: marshaler,
- TxConfig: tx.NewTxConfig(marshaler, tx.DefaultSignModes),
- Amino: cdc,
+ TxConfig: txCfg,
+ Amino: amino,
  }
 }

app/test_helpers.go

@@ -15,9 +15,10 @@ import (
 
  tmjson "github.com/tendermint/tendermint/libs/json"
 
+ "github.com/babylonchain/babylon/testutil/datagen"
+
  "github.com/babylonchain/babylon/app/params"
  appparams "github.com/babylonchain/babylon/app/params"
- "github.com/babylonchain/babylon/testutil/datagen"
 
  bam "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client"
@@ -79,7 +80,7 @@ type SetupOptions struct {
 
 func setup(withGenesis bool, invCheckPeriod uint) (*BabylonApp, GenesisState) {
  db := dbm.NewMemDB()
- encCdc := MakeTestEncodingConfig()
+ encCdc := MakeEncodingConfig()
  privSigner, err := SetupPrivSigner()
  if err != nil {
  panic(err)
@@ -244,7 +245,7 @@ func SetupPrivSigner() (*PrivSigner, error) {
  if err != nil {
  return nil, err
  }
- encodingCfg := appparams.MakeTestEncodingConfig()
+ encodingCfg := appparams.MakeEncodingConfig()
  privSigner, _ := InitPrivSigner(client.Context{}, ".", kr, encodingCfg)
  privSigner.WrappedPV.Clean(nodeCfg.PrivValidatorKeyFile(), nodeCfg.PrivValidatorStateFile())
  return privSigner, nil

cmd/babylond/cmd/add_gen_bls_test.go

@@ -3,10 +3,11 @@ package cmd_test
 import (
  "context"
  "fmt"
- "github.com/cosmos/cosmos-sdk/server/config"
  "path/filepath"
  "testing"
 
+ "github.com/cosmos/cosmos-sdk/server/config"
+
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/server"
@@ -36,7 +37,7 @@ func Test_AddGenBlsCmdWithoutGentx(t *testing.T) {
  tmcfg, err := genutiltest.CreateDefaultTendermintConfig(home)
  require.NoError(t, err)
 
- appCodec := app.MakeTestEncodingConfig().Marshaler
+ appCodec := app.MakeEncodingConfig().Marshaler
  err = genutiltest.ExecInitCmd(testMbm, home, appCodec)
  require.NoError(t, err)
 

cmd/babylond/cmd/genaccounts_test.go

@@ -13,15 +13,16 @@ import (
  "github.com/stretchr/testify/require"
  "github.com/tendermint/tendermint/libs/log"
 
- "github.com/babylonchain/babylon/app"
- bbncmd "github.com/babylonchain/babylon/cmd/babylond/cmd"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/server"
  "github.com/cosmos/cosmos-sdk/testutil/testdata"
  "github.com/cosmos/cosmos-sdk/types/module"
  "github.com/cosmos/cosmos-sdk/x/genutil"
  genutiltest "github.com/cosmos/cosmos-sdk/x/genutil/client/testutil"
+
+ "github.com/babylonchain/babylon/app"
+ bbncmd "github.com/babylonchain/babylon/cmd/babylond/cmd"
 )
 
 var testMbm = module.NewBasicManager(genutil.AppModuleBasic{})
@@ -73,7 +74,7 @@ func TestAddGenesisAccountCmd(t *testing.T) {
  cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
  require.NoError(t, err)
 
- appCodec := app.MakeTestEncodingConfig().Marshaler
+ appCodec := app.MakeEncodingConfig().Marshaler
  err = genutiltest.ExecInitCmd(testMbm, home, appCodec)
  require.NoError(t, err)
 

cmd/babylond/cmd/genbls_test.go

@@ -28,7 +28,7 @@ import (
 
 func Test_GenBlsCmd(t *testing.T) {
  home := t.TempDir()
- encodingConfig := app.MakeTestEncodingConfig()
+ encodingConfig := app.MakeEncodingConfig()
  logger := log.NewNopLogger()
  cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
  require.NoError(t, err)

cmd/babylond/cmd/root.go

@@ -40,7 +40,7 @@ import (
 // NewRootCmd creates a new root command for babylond. It is called once in the
 // main function.
 func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
- encodingConfig := app.MakeTestEncodingConfig()
+ encodingConfig := app.MakeEncodingConfig()
  initClientCtx := client.Context{}.
  WithCodec(encodingConfig.Marshaler).
  WithInterfaceRegistry(encodingConfig.InterfaceRegistry).

cmd/babylond/cmd/testnet_test.go

@@ -5,7 +5,6 @@ import (
  "fmt"
  "testing"
 
- "github.com/babylonchain/babylon/app"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/server"
@@ -15,11 +14,13 @@ import (
  "github.com/spf13/viper"
  "github.com/stretchr/testify/require"
  "github.com/tendermint/tendermint/libs/log"
+
+ "github.com/babylonchain/babylon/app"
 )
 
 func Test_TestnetCmd(t *testing.T) {
  home := t.TempDir()
- encodingConfig := app.MakeTestEncodingConfig()
+ encodingConfig := app.MakeEncodingConfig()
  logger := log.NewNopLogger()
  cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
  require.NoError(t, err)

cmd/babylond/cmd/validate_genesis_test.go

@@ -26,7 +26,7 @@ import (
 
 func TestCheckCorrespondence(t *testing.T) {
  homePath := t.TempDir()
- encodingCft := app.MakeTestEncodingConfig()
+ encodingCft := app.MakeEncodingConfig()
  clientCtx := client.Context{}.WithCodec(encodingCft.Marshaler).WithTxConfig(encodingCft.TxConfig)
 
  // generate valid genesis doc
@@ -85,7 +85,7 @@ func TestCheckCorrespondence(t *testing.T) {
 }
 
 func generateTestGenesisState(home string, n int) (map[string]json.RawMessage, *tmtypes.GenesisDoc) {
- encodingConfig := app.MakeTestEncodingConfig()
+ encodingConfig := app.MakeEncodingConfig()
  logger := log.NewNopLogger()
  cfg, _ := genutiltest.CreateDefaultTendermintConfig(home)
 

simapp/sim_bench_test.go

@@ -39,7 +39,7 @@ func BenchmarkFullAppSimulation(b *testing.B) {
  if err != nil {
  b.Fatal(err)
  }
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
 
  // run randomized simulation
  _, simParams, simErr := simulation.SimulateFromSeed(
@@ -93,7 +93,7 @@ func BenchmarkInvariants(b *testing.B) {
  if err != nil {
  b.Fatal(err)
  }
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
 
  // run randomized simulation
  _, simParams, simErr := simulation.SimulateFromSeed(

simapp/sim_test.go

@@ -12,13 +12,10 @@ import (
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
  dbm "github.com/tendermint/tm-db"
 
- "github.com/babylonchain/babylon/app"
  storetypes "github.com/cosmos/cosmos-sdk/store/types"
 
- btccheckpointtypes "github.com/babylonchain/babylon/x/btccheckpoint/types"
- btclightclienttypes "github.com/babylonchain/babylon/x/btclightclient/types"
- checkpointingtypes "github.com/babylonchain/babylon/x/checkpointing/types"
- epochingtypes "github.com/babylonchain/babylon/x/epoching/types"
+ "github.com/babylonchain/babylon/app"
+
  "github.com/cosmos/cosmos-sdk/baseapp"
  sdksimapp "github.com/cosmos/cosmos-sdk/simapp"
  "github.com/cosmos/cosmos-sdk/simapp/helpers"
@@ -38,6 +35,11 @@ import (
  slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
  abci "github.com/tendermint/tendermint/abci/types"
+
+ btccheckpointtypes "github.com/babylonchain/babylon/x/btccheckpoint/types"
+ btclightclienttypes "github.com/babylonchain/babylon/x/btclightclient/types"
+ checkpointingtypes "github.com/babylonchain/babylon/x/checkpointing/types"
+ epochingtypes "github.com/babylonchain/babylon/x/epoching/types"
 )
 
 // Get flags every time the simulator is run
@@ -77,7 +79,7 @@ func TestFullAppSimulation(t *testing.T) {
 
  privSigner, err := app.SetupPrivSigner()
  require.NoError(t, err)
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
  require.Equal(t, "BabylonApp", babylon.Name())
 
  // run randomized simulation
@@ -117,7 +119,7 @@ func TestAppImportExport(t *testing.T) {
 
  privSigner, err := app.SetupPrivSigner()
  require.NoError(t, err)
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
  require.Equal(t, "BabylonApp", babylon.Name())
 
  // Run randomized simulation
@@ -157,7 +159,7 @@ func TestAppImportExport(t *testing.T) {
  require.NoError(t, os.RemoveAll(newDir))
  }()
 
- newBabylon := app.NewBabylonApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
+ newBabylon := app.NewBabylonApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
  require.Equal(t, "BabylonApp", newBabylon.Name())
 
  var genesisState app.GenesisState
@@ -221,7 +223,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
 
  privSigner, err := app.SetupPrivSigner()
  require.NoError(t, err)
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
  require.Equal(t, "BabylonApp", babylon.Name())
 
  // Run randomized simulation
@@ -266,7 +268,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
  require.NoError(t, os.RemoveAll(newDir))
  }()
 
- newBabylon := app.NewBabylonApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
+ newBabylon := app.NewBabylonApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, fauxMerkleModeOpt)
  require.Equal(t, "BabylonApp", newBabylon.Name())
 
  newBabylon.InitChain(abci.RequestInitChain{
@@ -319,7 +321,7 @@ func TestAppStateDeterminism(t *testing.T) {
  db := dbm.NewMemDB()
  privSigner, err := app.SetupPrivSigner()
  require.NoError(t, err)
- babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeTestEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
+ babylon := app.NewBabylonApp(logger, db, nil, true, map[int64]bool{}, app.DefaultNodeHome, FlagPeriodValue, app.MakeEncodingConfig(), privSigner, sdksimapp.EmptyAppOptions{}, interBlockCacheOpt())
 
  fmt.Printf(
  "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n",

test/e2e/util/codec.go

@@ -22,7 +22,7 @@ func init() {
 }
 
 func initEncodingConfigAndCdc() (params.EncodingConfig, codec.Codec) {
- encodingConfig := babylonApp.MakeTestEncodingConfig()
+ encodingConfig := babylonApp.MakeEncodingConfig()
 
  encodingConfig.InterfaceRegistry.RegisterImplementations(
  (*sdk.Msg)(nil),

test/utils.go

@@ -8,12 +8,6 @@ import (
 
  tm "github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 
- "github.com/babylonchain/babylon/app"
- appparams "github.com/babylonchain/babylon/app/params"
- "github.com/babylonchain/babylon/testutil/datagen"
- bbn "github.com/babylonchain/babylon/types"
- btccheckpoint "github.com/babylonchain/babylon/x/btccheckpoint/types"
- lightclient "github.com/babylonchain/babylon/x/btclightclient/types"
  "github.com/btcsuite/btcd/wire"
  "github.com/cosmos/cosmos-sdk/client/tx"
  "github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -22,6 +16,13 @@ import (
  acctypes "github.com/cosmos/cosmos-sdk/x/auth/types"
  "github.com/tendermint/tendermint/types"
  "google.golang.org/grpc"
+
+ "github.com/babylonchain/babylon/app"
+ appparams "github.com/babylonchain/babylon/app/params"
+ "github.com/babylonchain/babylon/testutil/datagen"
+ bbn "github.com/babylonchain/babylon/types"
+ btccheckpoint "github.com/babylonchain/babylon/x/btccheckpoint/types"
+ lightclient "github.com/babylonchain/babylon/x/btclightclient/types"
 )
 
 type TestTxSender struct {
@@ -37,7 +38,7 @@ func NewTestTxSender(
  genesisPath string,
  conn *grpc.ClientConn,
 ) (*TestTxSender, error) {
- cfg := app.MakeTestEncodingConfig()
+ cfg := app.MakeEncodingConfig()
 
  kb, err := keyring.New("babylond", "test", keyringPath, nil, cfg.Marshaler)
 

x/checkpointing/client/cli/tx_test.go

@@ -22,11 +22,6 @@ import (
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/x/staking/client/cli"
 
- "github.com/babylonchain/babylon/app"
- "github.com/babylonchain/babylon/app/params"
- "github.com/babylonchain/babylon/privval"
- testutilcli "github.com/babylonchain/babylon/testutil/cli"
- checkpointcli "github.com/babylonchain/babylon/x/checkpointing/client/cli"
  abci "github.com/tendermint/tendermint/abci/types"
  tmconfig "github.com/tendermint/tendermint/config"
  tmbytes "github.com/tendermint/tendermint/libs/bytes"
@@ -35,6 +30,12 @@ import (
  rpcclientmock "github.com/tendermint/tendermint/rpc/client/mock"
  coretypes "github.com/tendermint/tendermint/rpc/core/types"
  tmtypes "github.com/tendermint/tendermint/types"
+
+ "github.com/babylonchain/babylon/app"
+ "github.com/babylonchain/babylon/app/params"
+ "github.com/babylonchain/babylon/privval"
+ testutilcli "github.com/babylonchain/babylon/testutil/cli"
+ checkpointcli "github.com/babylonchain/babylon/x/checkpointing/client/cli"
 )
 
 type mockTendermintRPC struct {
@@ -70,7 +71,7 @@ type CLITestSuite struct {
 }
 
 func (s *CLITestSuite) SetupSuite() {
- s.encCfg = app.MakeTestEncodingConfig()
+ s.encCfg = app.MakeEncodingConfig()
  s.kr = keyring.NewInMemory(s.encCfg.Marshaler)
  ctrl := gomock.NewController(s.T())
  mockAccountRetriever := mocks.NewMockAccountRetriever(ctrl)