From 1c0d5577077fd1b4376bb7bdd6319ab4ee2c8a0d Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Tue, 25 Feb 2020 17:27:26 +0100 Subject: [PATCH] Update tests --- x/wasm/alias.go | 3 ++- x/wasm/genesis_test.go | 4 ++-- x/wasm/module_test.go | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/x/wasm/alias.go b/x/wasm/alias.go index 8d7fe6bc..71d30c7a 100644 --- a/x/wasm/alias.go +++ b/x/wasm/alias.go @@ -23,6 +23,7 @@ const ( QueryGetContractState = keeper.QueryGetContractState QueryGetCode = keeper.QueryGetCode QueryListCode = keeper.QueryListCode + QueryListContractByCode = keeper.QueryListContractByCode QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart QueryMethodContractStateAll = keeper.QueryMethodContractStateAll QueryMethodContractStateRaw = keeper.QueryMethodContractStateRaw @@ -76,9 +77,9 @@ type ( Model = types.Model CodeInfo = types.CodeInfo ContractInfo = types.ContractInfo - ContractInfoWithAddress = types.ContractInfoWithAddress WasmConfig = types.WasmConfig Keeper = keeper.Keeper + ContractInfoWithAddress = keeper.ContractInfoWithAddress GetCodeResponse = keeper.GetCodeResponse ListCodeResponse = keeper.ListCodeResponse ) diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go index 132f3585..74082b5c 100644 --- a/x/wasm/genesis_test.go +++ b/x/wasm/genesis_test.go @@ -111,7 +111,7 @@ func TestInitGenesis(t *testing.T) { assertCodeList(t, q, data.ctx, 1) assertCodeBytes(t, q, data.ctx, 1, testContract) - assertContractList(t, q, data.ctx, []string{contractAddr.String()}) + assertContractList(t, q, data.ctx, 1, []string{contractAddr.String()}) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator) assertContractState(t, q, data.ctx, contractAddr, state{ Verifier: []byte(fred), @@ -134,7 +134,7 @@ func TestInitGenesis(t *testing.T) { assertCodeList(t, q2, newData.ctx, 1) assertCodeBytes(t, q2, newData.ctx, 1, testContract) - assertContractList(t, q2, newData.ctx, []string{contractAddr.String()}) + assertContractList(t, q2, newData.ctx, 1, []string{contractAddr.String()}) assertContractInfo(t, q2, newData.ctx, contractAddr, 1, creator) assertContractState(t, q2, newData.ctx, contractAddr, state{ Verifier: []byte(fred), diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go index d2e98b8c..09dc152d 100644 --- a/x/wasm/module_test.go +++ b/x/wasm/module_test.go @@ -173,7 +173,7 @@ func TestHandleInstantiate(t *testing.T) { assertCodeList(t, q, data.ctx, 1) assertCodeBytes(t, q, data.ctx, 1, testContract) - assertContractList(t, q, data.ctx, []string{contractAddr.String()}) + assertContractList(t, q, data.ctx, 1, []string{contractAddr.String()}) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator) assertContractState(t, q, data.ctx, contractAddr, state{ Verifier: []byte(fred), @@ -260,7 +260,7 @@ func TestHandleExecute(t *testing.T) { assertCodeList(t, q, data.ctx, 1) assertCodeBytes(t, q, data.ctx, 1, testContract) - assertContractList(t, q, data.ctx, []string{contractAddr.String()}) + assertContractList(t, q, data.ctx, 1, []string{contractAddr.String()}) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator) assertContractState(t, q, data.ctx, contractAddr, state{ Verifier: []byte(fred), @@ -391,16 +391,16 @@ func assertContractList(t *testing.T, q sdk.Querier, ctx sdk.Context, codeID uin return } - var res []ContractInfo + var res []ContractInfoWithAddress err := json.Unmarshal(bz, &res) require.NoError(t, err) var hasAddrs = make([]string, len(res)) for i, r := range res { - hasAddrs[i] = r.Address + hasAddrs[i] = r.Address.String() } - assert.Equal(t, addrs, res) + assert.Equal(t, hasAddrs, addrs) } func assertContractState(t *testing.T, q sdk.Querier, ctx sdk.Context, addr sdk.AccAddress, expected state) {