Refactor 08-wasm with improvements after 02-client refactor

modules/light-clients/08-wasm/keeper/querier.go

@@ -45,7 +45,6 @@ type queryHandler struct {
 }
 
 // newQueryHandler returns a default querier that can be used in the contract.
-// TODO(jim): Make private and use export_test?
 func newQueryHandler(ctx sdk.Context, plugins QueryPlugins, callerID string) *queryHandler {
 	return &queryHandler{
 		Ctx:      ctx,

modules/light-clients/08-wasm/keeper/querier_test.go

@@ -328,13 +328,14 @@ func (suite *KeeperTestSuite) TestStargateQuery() {
 			// NOTE: we register query callbacks against: types.TimestampAtHeightMsg{}
 			// in practise, this can against any client state msg, however registering against types.StatusMsg{} introduces recursive loops
 			// due to test case: "success: verify membership query"
-			// TODO(Jim): Sanity check that it unmarshals correctly?
-			_, err = wasmClientKeeper.WasmQuery(suite.chainA.GetContext(), endpoint.ClientID, clientStore, clientState, payload)
+			res, err := wasmClientKeeper.WasmQuery(suite.chainA.GetContext(), endpoint.ClientID, clientStore, clientState, payload)
 
 			expPass := tc.expError == nil
 			if expPass {
 				suite.Require().NoError(err)
+				suite.Require().NotNil(res)
 			} else {
+				suite.Require().Nil(res)
 				// use error contains as wasmvm errors do not implement errors.Is method
 				suite.Require().ErrorContains(err, tc.expError.Error())
 			}

modules/light-clients/08-wasm/light_client_module.go

@@ -187,7 +187,7 @@
 
 	clientMessage, ok := clientMsg.(*types.ClientMessage)
 	if !ok {
 		panic(fmt.Errorf("expected type %T, got %T", &types.ClientMessage{}, clientMsg))
 	}
 
 	payload := types.SudoMsg{
@@ -196,12 +196,12 @@
 
 	res, err := l.keeper.WasmSudo(ctx, clientID, clientStore, clientState, payload)
 	if err != nil {
 		panic(err)
 	}
 
 	var result types.UpdateStateResult
 	if err := json.Unmarshal(res, &result); err != nil {
 		panic(errorsmod.Wrap(types.ErrWasmInvalidResponseData, err.Error()))
 	}
 
 	heights := []exported.Height{}
@@ -438,13 +438,11 @@
 	}
 
 	substituteClientStore := l.storeProvider.ClientStore(ctx, substituteClientID)
-	substituteClient, found := types.GetClientState(substituteClientStore, cdc)
+	substituteClientState, found := types.GetClientState(substituteClientStore, cdc)
 	if !found {
 		return errorsmod.Wrap(clienttypes.ErrClientNotFound, substituteClientID)
 	}
 
-	substituteClientState := substituteClient
-
 	// check that checksums of subject client state and substitute client state match
 	// changing the checksum is only allowed through the migrate contract RPC endpoint
 	if !bytes.Equal(clientState.Checksum, substituteClientState.Checksum) {

modules/light-clients/08-wasm/light_client_module_test.go

@@ -854,7 +854,9 @@ func (suite *WasmTestSuite) TestVerifyUpgradeAndUpdateState() {
 			},
 			clienttypes.ErrClientNotFound,
 		},
-		/* TODO(jim): Get back to these.
+		/* NOTE(jim): This can't fail on unmarshalling, it appears. Any consensus type
+					  we attempt to unmarshal just creates a Wasm ConsensusState that has a
+					  Data field empty.
 		{
 			"failure: upgraded consensus state is not wasm consensus state",
 			func() {
@@ -1422,8 +1424,7 @@ func (suite *WasmTestSuite) TestRecoverClient() {
 						bz, err := json.Marshal(types.EmptyResult{})
 						suite.Require().NoError(err)
 
-						// TODO(jim): re-arrange export_test.go contents
-						prefixedKey := []byte("subject/")
+						prefixedKey := types.SubjectPrefix
 						prefixedKey = append(prefixedKey, host.ClientStateKey()...)
 						expectedClientStateBz = wasmtesting.CreateMockClientStateBz(suite.chainA.Codec, suite.checksum)
 						store.Set(prefixedKey, expectedClientStateBz)
@@ -1462,24 +1463,20 @@ func (suite *WasmTestSuite) TestRecoverClient() {
 			},
 			clienttypes.ErrClientNotFound,
 		},
-		/* TODO(jim): We don't pass a client state directly now so we need to modify how this is tested.
-		{
-			"failure: invalid substitute client state",
-			func() {
-				substituteClientState = &ibctm.ClientState{}
-			},
-			clienttypes.ErrInvalidClient,
-		},
 		{
 			"failure: checksums do not match",
 			func() {
-				substituteClientState = &types.ClientState{
-					Checksum: []byte("invalid"),
-				}
+				substituteClientState, found := GetSimApp(suite.chainA).IBCKeeper.ClientKeeper.GetClientState(suite.chainA.GetContext(), substituteClientID)
+				suite.Require().True(found)
+
+				wasmSubstituteClientState, ok := substituteClientState.(*types.ClientState)
+				suite.Require().True(ok)
+
+				wasmSubstituteClientState.Checksum = []byte("invalid")
+				GetSimApp(suite.chainA).IBCKeeper.ClientKeeper.SetClientState(suite.chainA.GetContext(), substituteClientID, wasmSubstituteClientState)
 			},
 			clienttypes.ErrInvalidClient,
 		},
-		*/
 		{
 			"failure: vm returns error",
 			func() {