Update tests

This commit is contained in:
Ethan Frey
2020-02-25 17:27:26 +01:00
parent c509fb91d8
commit 1c0d557707
3 changed files with 9 additions and 8 deletions

View File

@@ -23,6 +23,7 @@ const (
QueryGetContractState = keeper.QueryGetContractState QueryGetContractState = keeper.QueryGetContractState
QueryGetCode = keeper.QueryGetCode QueryGetCode = keeper.QueryGetCode
QueryListCode = keeper.QueryListCode QueryListCode = keeper.QueryListCode
QueryListContractByCode = keeper.QueryListContractByCode
QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart
QueryMethodContractStateAll = keeper.QueryMethodContractStateAll QueryMethodContractStateAll = keeper.QueryMethodContractStateAll
QueryMethodContractStateRaw = keeper.QueryMethodContractStateRaw QueryMethodContractStateRaw = keeper.QueryMethodContractStateRaw
@@ -76,9 +77,9 @@ type (
Model = types.Model Model = types.Model
CodeInfo = types.CodeInfo CodeInfo = types.CodeInfo
ContractInfo = types.ContractInfo ContractInfo = types.ContractInfo
ContractInfoWithAddress = types.ContractInfoWithAddress
WasmConfig = types.WasmConfig WasmConfig = types.WasmConfig
Keeper = keeper.Keeper Keeper = keeper.Keeper
ContractInfoWithAddress = keeper.ContractInfoWithAddress
GetCodeResponse = keeper.GetCodeResponse GetCodeResponse = keeper.GetCodeResponse
ListCodeResponse = keeper.ListCodeResponse ListCodeResponse = keeper.ListCodeResponse
) )

View File

@@ -111,7 +111,7 @@ func TestInitGenesis(t *testing.T) {
assertCodeList(t, q, data.ctx, 1) assertCodeList(t, q, data.ctx, 1)
assertCodeBytes(t, q, data.ctx, 1, testContract) 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) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{ assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: []byte(fred), Verifier: []byte(fred),
@@ -134,7 +134,7 @@ func TestInitGenesis(t *testing.T) {
assertCodeList(t, q2, newData.ctx, 1) assertCodeList(t, q2, newData.ctx, 1)
assertCodeBytes(t, q2, newData.ctx, 1, testContract) 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) assertContractInfo(t, q2, newData.ctx, contractAddr, 1, creator)
assertContractState(t, q2, newData.ctx, contractAddr, state{ assertContractState(t, q2, newData.ctx, contractAddr, state{
Verifier: []byte(fred), Verifier: []byte(fred),

View File

@@ -173,7 +173,7 @@ func TestHandleInstantiate(t *testing.T) {
assertCodeList(t, q, data.ctx, 1) assertCodeList(t, q, data.ctx, 1)
assertCodeBytes(t, q, data.ctx, 1, testContract) 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) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{ assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: []byte(fred), Verifier: []byte(fred),
@@ -260,7 +260,7 @@ func TestHandleExecute(t *testing.T) {
assertCodeList(t, q, data.ctx, 1) assertCodeList(t, q, data.ctx, 1)
assertCodeBytes(t, q, data.ctx, 1, testContract) 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) assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{ assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: []byte(fred), Verifier: []byte(fred),
@@ -391,16 +391,16 @@ func assertContractList(t *testing.T, q sdk.Querier, ctx sdk.Context, codeID uin
return return
} }
var res []ContractInfo var res []ContractInfoWithAddress
err := json.Unmarshal(bz, &res) err := json.Unmarshal(bz, &res)
require.NoError(t, err) require.NoError(t, err)
var hasAddrs = make([]string, len(res)) var hasAddrs = make([]string, len(res))
for i, r := range 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) { func assertContractState(t *testing.T, q sdk.Querier, ctx sdk.Context, addr sdk.AccAddress, expected state) {