app: cleanup

PeggyJV · Jan 7, 2021 · 7fc2e32 · 7fc2e32
1 parent b312667
commit 7fc2e32
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 703 deletions.
diff --git a/app/app.go b/app/app.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
 
@@ -143,7 +144,7 @@ var (
 )
 
 var (
-	_ App                     = (*SommelierApp)(nil)
+	_ simapp.App              = (*SommelierApp)(nil)
 	_ servertypes.Application = (*SommelierApp)(nil)
 )
 

diff --git a/app/config.go b/app/config.go
diff --git a/app/params/doc.go b/app/params/doc.go
diff --git a/app/params/encoding.go b/app/params/encoding.go
@@ -4,6 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 )
 
 // EncodingConfig specifies the concrete encoding types to use for a given app.
@@ -14,3 +15,18 @@ type EncodingConfig struct {
 	TxConfig          client.TxConfig
 	Amino             *codec.LegacyAmino
 }
+
+// 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:          txCfg,
+		Amino:             amino,
+	}
+}
diff --git a/app/params/params.go b/app/params/params.go
diff --git a/app/params/proto.go b/app/params/proto.go
diff --git a/app/params/weights.go b/app/params/weights.go
diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go