mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed module tests (disabled escrow)

Browse Source
This commit is contained in:
Ethan Frey
2020-01-16 12:41:32 +01:00
parent d891dd8f7a
commit 27c5483ba7
2 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
x/wasm/genesis_test.go
View File

@@ -9,6 +9,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
)
type contractState struct {
}
func TestInitGenesis(t *testing.T) {
data, cleanup := setupTest(t)
defer cleanup()
@@ -31,8 +34,8 @@ func TestInitGenesis(t *testing.T) {
_, _, bob := keyPubAddr()
initMsg := initMsg{
Verifier: fred.String(),
Beneficiary: bob.String(),
Verifier: fred,
Beneficiary: bob,
}
initMsgBz, err := json.Marshal(initMsg)
require.NoError(t, err)
@@ -63,9 +66,9 @@ func TestInitGenesis(t *testing.T) {
assertContractList(t, q, data.ctx, []string{contractAddr.String()})
assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: fred.String(),
Beneficiary: bob.String(),
Funder: creator.String(),
Verifier: []byte(fred),
Beneficiary: []byte(bob),
Funder: []byte(creator),
})
// export into genstate
@@ -86,8 +89,8 @@ func TestInitGenesis(t *testing.T) {
assertContractList(t, q2, newData.ctx, []string{contractAddr.String()})
assertContractInfo(t, q2, newData.ctx, contractAddr, 1, creator)
assertContractState(t, q2, newData.ctx, contractAddr, state{
Verifier: fred.String(),
Beneficiary: bob.String(),
Funder: creator.String(),
Verifier: []byte(fred),
Beneficiary: []byte(bob),
Funder: []byte(creator),
})
}

64
x/wasm/module_test.go
View File

@@ -7,17 +7,18 @@ import (
"os"
"testing"
"github.com/cosmwasm/wasmd/x/wasm/internal/keeper"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
wasmTypes "github.com/confio/go-cosmwasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cosmwasm/wasmd/x/wasm/internal/keeper"
)
type testData struct {
@@ -87,13 +88,15 @@ func TestHandleCreate(t *testing.T) {
},
isValid: true,
},
"other valid wasm": {
msg: MsgStoreCode{
Sender: addr1,
WASMByteCode: escrowContract,
},
isValid: true,
},
// TODO: enable this when we upload 0.6.3 escrow contract
// "other valid wasm": {
// msg: MsgStoreCode{
// Sender: addr1,
// WASMByteCode: escrowContract,
// },
// isValid: true,
// },
}
for name, tc := range cases {
@@ -119,14 +122,14 @@ func TestHandleCreate(t *testing.T) {
}
type initMsg struct {
Verifier string `json:"verifier"`
Beneficiary string `json:"beneficiary"`
Verifier sdk.AccAddress `json:"verifier"`
Beneficiary sdk.AccAddress `json:"beneficiary"`
}
type state struct {
Verifier string `json:"verifier"`
Beneficiary string `json:"beneficiary"`
Funder string `json:"funder"`
Verifier wasmTypes.CanonicalAddress `json:"verifier"`
Beneficiary wasmTypes.CanonicalAddress `json:"beneficiary"`
Funder wasmTypes.CanonicalAddress `json:"funder"`
}
func TestHandleInstantiate(t *testing.T) {
@@ -147,9 +150,12 @@ func TestHandleInstantiate(t *testing.T) {
require.True(t, res.IsOK())
require.Equal(t, res.Data, []byte("1"))
_, _, bob := keyPubAddr()
_, _, fred := keyPubAddr()
initMsg := initMsg{
Verifier: "fred",
Beneficiary: "bob",
Verifier: fred,
Beneficiary: bob,
}
initMsgBz, err := json.Marshal(initMsg)
require.NoError(t, err)
@@ -162,7 +168,7 @@ func TestHandleInstantiate(t *testing.T) {
InitFunds: nil,
}
res = h(data.ctx, initCmd)
require.True(t, res.IsOK())
require.True(t, res.IsOK(), res.Log)
contractAddr := sdk.AccAddress(res.Data)
require.Equal(t, "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", contractAddr.String())
@@ -172,9 +178,9 @@ func TestHandleInstantiate(t *testing.T) {
assertContractList(t, q, data.ctx, []string{contractAddr.String()})
assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: "fred",
Beneficiary: "bob",
Funder: creator.String(),
Verifier: []byte(fred),
Beneficiary: []byte(bob),
Funder: []byte(creator),
})
}
@@ -200,8 +206,8 @@ func TestHandleExecute(t *testing.T) {
_, _, bob := keyPubAddr()
initMsg := initMsg{
Verifier: fred.String(),
Beneficiary: bob.String(),
Verifier: fred,
Beneficiary: bob,
}
initMsgBz, err := json.Marshal(initMsg)
require.NoError(t, err)
@@ -259,13 +265,15 @@ func TestHandleExecute(t *testing.T) {
assertContractList(t, q, data.ctx, []string{contractAddr.String()})
assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
assertContractState(t, q, data.ctx, contractAddr, state{
Verifier: fred.String(),
Beneficiary: bob.String(),
Funder: creator.String(),
Verifier: []byte(fred),
Beneficiary: []byte(bob),
Funder: []byte(creator),
})
}
func TestHandleExecuteEscrow(t *testing.T) {
// TODO
t.Skip("Update escrow contract first")
data, cleanup := setupTest(t)
defer cleanup()
@@ -281,7 +289,7 @@ func TestHandleExecuteEscrow(t *testing.T) {
WASMByteCode: escrowContract,
}
res := h(data.ctx, &msg)
require.True(t, res.IsOK())
require.True(t, res.IsOK(), res.Log)
require.Equal(t, res.Data, []byte("1"))
_, _, bob := keyPubAddr()