Fix up module level tests, only 2 skipped

x/wasm/module_test.go

@@ -63,7 +63,8 @@ func mustLoad(path string) []byte {
 var (
 	key1, pub1, addr1 = keyPubAddr()
 	testContract      = mustLoad("./internal/keeper/testdata/contract.wasm")
-	escrowContract    = mustLoad("./testdata/escrow.wasm")
+	maskContract      = mustLoad("./internal/keeper/testdata/mask.wasm")
+	oldContract       = mustLoad("./testdata/escrow_0.7.wasm")
 )
 
 func TestHandleCreate(t *testing.T) {
@@ -92,10 +93,17 @@ func TestHandleCreate(t *testing.T) {
 		"other valid wasm": {
 			msg: MsgStoreCode{
 				Sender:       addr1,
-				WASMByteCode: escrowContract,
+				WASMByteCode: maskContract,
 			},
 			isValid: true,
 		},
+		"old wasm (0.7)": {
+			msg: MsgStoreCode{
+				Sender:       addr1,
+				WASMByteCode: oldContract,
+			},
+			isValid: false,
+		},
 	}
 
 	for name, tc := range cases {
@@ -310,7 +318,7 @@ func TestHandleExecuteEscrow(t *testing.T) {
 
 	msg := MsgStoreCode{
 		Sender:       creator,
-		WASMByteCode: escrowContract,
+		WASMByteCode: testContract,
 	}
 	res, err := h(data.ctx, &msg)
 	require.NoError(t, err)
@@ -318,10 +326,8 @@ func TestHandleExecuteEscrow(t *testing.T) {
 
 	_, _, bob := keyPubAddr()
 	initMsg := map[string]interface{}{
-		"arbiter":    fred.String(),
-		"recipient":  bob.String(),
-		"end_time":   0,
-		"end_height": 0,
+		"verifier":    fred.String(),
+		"beneficiary": bob.String(),
 	}
 	initMsgBz, err := json.Marshal(initMsg)
 	require.NoError(t, err)
@@ -338,7 +344,7 @@ func TestHandleExecuteEscrow(t *testing.T) {
 	require.Equal(t, "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", contractAddr.String())
 
 	handleMsg := map[string]interface{}{
-		"approve": map[string]interface{}{},
+		"release": map[string]interface{}{},
 	}
 	handleMsgBz, err := json.Marshal(handleMsg)
 	require.NoError(t, err)
@@ -362,19 +368,6 @@ func TestHandleExecuteEscrow(t *testing.T) {
 	contractAcct := data.acctKeeper.GetAccount(data.ctx, contractAddr)
 	require.NotNil(t, contractAcct)
 	assert.Equal(t, sdk.Coins(nil), contractAcct.GetCoins())
-
-	// q := data.module.NewQuerierHandler()
-	// // ensure all contract state is as after init
-	// assertCodeList(t, q, data.ctx, 1)
-	// assertCodeBytes(t, q, data.ctx, 1, testContract)
-
-	// 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(),
-	// })
 }
 
 type prettyEvent struct {