Merge pull request #366 from CosmWasm/grpc_service_328

Refactor to GRPC message server

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 
 **Features:**
+- Refactor to GRPC message server [\#366](https://github.com/CosmWasm/wasmd/pull/366)
 - Make it easy to initialize contracts in genesis file with new CLI commands[\#326](https://github.com/CosmWasm/wasmd/issues/326)
 - Upgrade to WasmVM v0.13.0 [\#358](https://github.com/CosmWasm/wasmd/pull/358)
 - Upgrade to cosmos-sdk v0.40.0-rc6 [\#354](https://github.com/CosmWasm/wasmd/pull/354)

Makefile

@@ -7,7 +7,7 @@ LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 
 # for dockerized protobuf tools
-PROTO_CONTAINER := cosmwasm/prototools-docker:latest
+PROTO_CONTAINER := cosmwasm/prototools-docker:v0.1.0
 DOCKER_BUF := docker run --rm -v $(shell pwd)/buf.yaml:/workspace/buf.yaml -v $(shell go list -f "{{ .Dir }}" -m github.com/cosmos/cosmos-sdk):/workspace/cosmos_sdk_dir -v $(shell pwd):/workspace/wasmd  --workdir /workspace $(PROTO_CONTAINER)
 HTTPS_GIT := https://github.com/CosmWasm/wasmd.git
 

x/wasm/alias.go

@@ -100,31 +100,38 @@ var (
 )
 
 type (
-	ProposalType            = types.ProposalType
-	GenesisState            = types.GenesisState
-	Code                    = types.Code
-	Contract                = types.Contract
-	MsgStoreCode            = types.MsgStoreCode
-	MsgInstantiateContract  = types.MsgInstantiateContract
-	MsgExecuteContract      = types.MsgExecuteContract
-	MsgMigrateContract      = types.MsgMigrateContract
-	MsgUpdateAdmin          = types.MsgUpdateAdmin
-	MsgClearAdmin           = types.MsgClearAdmin
-	Model                   = types.Model
-	CodeInfo                = types.CodeInfo
-	ContractInfo            = types.ContractInfo
-	CreatedAt               = types.AbsoluteTxPosition
-	Config                  = types.WasmConfig
-	ContractInfoWithAddress = types.ContractInfoWithAddress
-	CodeInfoResponse        = types.CodeInfoResponse
-	MessageHandler          = keeper.MessageHandler
-	BankEncoder             = keeper.BankEncoder
-	CustomEncoder           = keeper.CustomEncoder
-	StakingEncoder          = keeper.StakingEncoder
-	WasmEncoder             = keeper.WasmEncoder
-	MessageEncoders         = keeper.MessageEncoders
-	Keeper                  = keeper.Keeper
-	QueryHandler            = keeper.QueryHandler
-	CustomQuerier           = keeper.CustomQuerier
-	QueryPlugins            = keeper.QueryPlugins
+	ProposalType                   = types.ProposalType
+	GenesisState                   = types.GenesisState
+	Code                           = types.Code
+	Contract                       = types.Contract
+	MsgStoreCode                   = types.MsgStoreCode
+	MsgStoreCodeResponse           = types.MsgStoreCodeResponse
+	MsgInstantiateContract         = types.MsgInstantiateContract
+	MsgInstantiateContractResponse = types.MsgInstantiateContractResponse
+	MsgExecuteContract             = types.MsgExecuteContract
+	MsgExecuteContractResponse     = types.MsgExecuteContractResponse
+	MsgMigrateContract             = types.MsgMigrateContract
+	MsgMigrateContractResponse     = types.MsgMigrateContractResponse
+	MsgUpdateAdmin                 = types.MsgUpdateAdmin
+	MsgUpdateAdminResponse         = types.MsgUpdateAdminResponse
+	MsgClearAdmin                  = types.MsgClearAdmin
+	MsgClearAdminResponse          = types.MsgClearAdminResponse
+	MsgServer                      = types.MsgServer
+	Model                          = types.Model
+	CodeInfo                       = types.CodeInfo
+	ContractInfo                   = types.ContractInfo
+	CreatedAt                      = types.AbsoluteTxPosition
+	Config                         = types.WasmConfig
+	ContractInfoWithAddress        = types.ContractInfoWithAddress
+	CodeInfoResponse               = types.CodeInfoResponse
+	MessageHandler                 = keeper.MessageHandler
+	BankEncoder                    = keeper.BankEncoder
+	CustomEncoder                  = keeper.CustomEncoder
+	StakingEncoder                 = keeper.StakingEncoder
+	WasmEncoder                    = keeper.WasmEncoder
+	MessageEncoders                = keeper.MessageEncoders
+	Keeper                         = keeper.Keeper
+	QueryHandler                   = keeper.QueryHandler
+	CustomQuerier                  = keeper.CustomQuerier
+	QueryPlugins                   = keeper.QueryPlugins
 )

x/wasm/common_test.go

@@ -0,0 +1,33 @@
+package wasm
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+// ensure store code returns the expected response
+func assertStoreCodeResponse(t *testing.T, data []byte, expected uint64) {
+	var pStoreResp MsgStoreCodeResponse
+	require.NoError(t, pStoreResp.Unmarshal(data))
+	require.Equal(t, pStoreResp.CodeID, expected)
+}
+
+// ensure execution returns the expected data
+func assertExecuteResponse(t *testing.T, data []byte, expected []byte) {
+	var pExecResp MsgExecuteContractResponse
+	require.NoError(t, pExecResp.Unmarshal(data))
+	require.Equal(t, pExecResp.Data, expected)
+}
+
+// ensures this returns a valid bech32 address and returns it
+func parseInitResponse(t *testing.T, data []byte) string {
+	var pInstResp MsgInstantiateContractResponse
+	require.NoError(t, pInstResp.Unmarshal(data))
+	require.NotEmpty(t, pInstResp.Address)
+	addr := pInstResp.Address
+	// ensure this is a valid sdk address
+	_, err := sdk.AccAddressFromBech32(addr)
+	require.NoError(t, err)
+	return addr
+}

x/wasm/genesis_test.go

@@ -22,15 +22,15 @@ func TestInitGenesis(t *testing.T) {
 	msg := MsgStoreCode{
 		Sender:       creator.String(),
 		WASMByteCode: testContract,
-		Source:       "https://github.com/CosmWasm/wasmd/blob/master/x/wasm/testdata/escrow.wasm",
+		Source:       "https://github.com/CosmWasm/wasmd/blob/master/x/wasm/testdata/hackatom.wasm",
 		Builder:      "confio/cosmwasm-opt:0.7.0",
 	}
 	err := msg.ValidateBasic()
 	require.NoError(t, err)
 
 	res, err := h(data.ctx, &msg)
 	require.NoError(t, err)
-	require.Equal(t, res.Data, []byte("1"))
+	assertStoreCodeResponse(t, res.Data, 1)
 
 	_, _, bob := keyPubAddr()
 	initMsg := initMsg{
@@ -48,7 +48,7 @@ func TestInitGenesis(t *testing.T) {
 	}
 	res, err = h(data.ctx, &initCmd)
 	require.NoError(t, err)
-	contractBech32Addr := string(res.Data)
+	contractBech32Addr := parseInitResponse(t, res.Data)
 
 	execCmd := MsgExecuteContract{
 		Sender:    fred.String(),
@@ -58,6 +58,8 @@ func TestInitGenesis(t *testing.T) {
 	}
 	res, err = h(data.ctx, &execCmd)
 	require.NoError(t, err)
+	// from https://github.com/CosmWasm/cosmwasm/blob/master/contracts/hackatom/src/contract.rs#L167
+	assertExecuteResponse(t, res.Data, []byte{0xf0, 0x0b, 0xaa})
 
 	// ensure all contract state is as after init
 	assertCodeList(t, q, data.ctx, 1)