Merge pull request cosmos#760 from CosmWasm/749-client-encoding

Replace custom codec with sdk codec
notional-labs · Feb 21, 2022 · 95d58b8 · 95d58b8
2 parents e0e6cc4 + 0fc0ac5
commit 95d58b8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 81 deletions.
diff --git a/cmd/wasmd/root.go b/cmd/wasmd/root.go
@@ -34,7 +34,6 @@ import (
 	"github.com/CosmWasm/wasmd/app"
 	"github.com/CosmWasm/wasmd/app/params"
 	"github.com/CosmWasm/wasmd/x/wasm"
-	clientcodec "github.com/CosmWasm/wasmd/x/wasm/client/codec"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )
@@ -52,7 +51,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 	cfg.Seal()
 
 	initClientCtx := client.Context{}.
-		WithCodec(clientcodec.NewProtoCodec(encodingConfig.Marshaler, encodingConfig.InterfaceRegistry)).
+		WithCodec(encodingConfig.Marshaler).
 		WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
 		WithTxConfig(encodingConfig.TxConfig).
 		WithLegacyAmino(encodingConfig.Amino).

diff --git a/x/wasm/client/codec/marshaller.go b/x/wasm/client/codec/marshaller.go