encoding: tests (#63)

* encoding: tests

* transaction hashing test

app/app_test.go

@@ -12,11 +12,13 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
+
+	"github.com/cosmos/ethermint/encoding"
 )
 
 func TestEthermintAppExport(t *testing.T) {
 	db := dbm.NewMemDB()
-	app := NewEthermintApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig(), simapp.EmptyAppOptions{})
+	app := NewEthermintApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{})
 
 	genesisState := NewDefaultGenesisState()
 	stateBytes, err := json.MarshalIndent(genesisState, "", "  ")
@@ -33,7 +35,7 @@ func TestEthermintAppExport(t *testing.T) {
 	app.Commit()
 
 	// Making a new app object with the db, so that initchain hasn't been called
-	app2 := NewEthermintApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig(), simapp.EmptyAppOptions{})
+	app2 := NewEthermintApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{})
 	_, err = app2.ExportAppStateAndValidators(false, []string{})
 	require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
 }

app/encoding.go

@@ -1,76 +0,0 @@
-package app
-
-import (
-	"github.com/cosmos/cosmos-sdk/client"
-	amino "github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/simapp/params"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/tx"
-
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
-
-	"github.com/cosmos/ethermint/codec"
-	evmtypes "github.com/cosmos/ethermint/x/evm/types"
-)
-
-// MakeEncodingConfig creates an EncodingConfig for testing
-func MakeEncodingConfig() params.EncodingConfig {
-	cdc := amino.NewLegacyAmino()
-	interfaceRegistry := types.NewInterfaceRegistry()
-	marshaler := amino.NewProtoCodec(interfaceRegistry)
-
-	encodingConfig := params.EncodingConfig{
-		InterfaceRegistry: interfaceRegistry,
-		Marshaler:         marshaler,
-		TxConfig:          NewTxConfig(marshaler),
-		Amino:             cdc,
-	}
-
-	codec.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	codec.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	return encodingConfig
-}
-
-type txConfig struct {
-	cdc amino.ProtoCodecMarshaler
-	client.TxConfig
-}
-
-// NewTxConfig returns a new protobuf TxConfig using the provided ProtoCodec and sign modes. The
-// first enabled sign mode will become the default sign mode.
-func NewTxConfig(marshaler amino.ProtoCodecMarshaler) client.TxConfig {
-	return &txConfig{
-		marshaler,
-		tx.NewTxConfig(marshaler, tx.DefaultSignModes),
-	}
-}
-
-// TxEncoder overwrites sdk.TxEncoder to support MsgEthereumTx
-func (g txConfig) TxEncoder() sdk.TxEncoder {
-	return func(tx sdk.Tx) ([]byte, error) {
-		msg, ok := tx.(*evmtypes.MsgEthereumTx)
-		if ok {
-			return msg.AsTransaction().MarshalBinary()
-		}
-		return g.TxConfig.TxEncoder()(tx)
-	}
-}
-
-// TxDecoder overwrites sdk.TxDecoder to support MsgEthereumTx
-func (g txConfig) TxDecoder() sdk.TxDecoder {
-	return func(txBytes []byte) (sdk.Tx, error) {
-		tx := &ethtypes.Transaction{}
-
-		err := tx.UnmarshalBinary(txBytes)
-		if err == nil {
-			msg := &evmtypes.MsgEthereumTx{}
-			msg.FromEthereumTx(tx)
-			return msg, nil
-		}
-
-		return g.TxConfig.TxDecoder()(txBytes)
-	}
-}

app/export.go

@@ -12,11 +12,13 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
+	"github.com/cosmos/ethermint/encoding"
 )
 
 // NewDefaultGenesisState generates the default state for the application.
 func NewDefaultGenesisState() simapp.GenesisState {
-	encCfg := MakeEncodingConfig()
+	encCfg := encoding.MakeConfig(ModuleBasics)
 	return ModuleBasics.DefaultGenesis(encCfg.Marshaler)
 }
 

app/test_helpers.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/ethermint/encoding"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/log"
@@ -35,7 +36,7 @@ var DefaultConsensusParams = &abci.ConsensusParams{
 // Setup initializes a new EthermintApp. A Nop logger is set in EthermintApp.
 func Setup(isCheckTx bool) *EthermintApp {
 	db := dbm.NewMemDB()
-	app := NewEthermintApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig(), simapp.EmptyAppOptions{})
+	app := NewEthermintApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{})
 	if !isCheckTx {
 		// init chain must be called to stop deliverState from being nil
 		genesisState := NewDefaultGenesisState()