Consistent argument order in entrypoint wrappers. (backport #5134) (#…

…5247) * Consistent argument order in entrypoint wrappers. (#5134) (cherry picked from commit 482b6b2) # Conflicts: # modules/light-clients/08-wasm/types/export_test.go # modules/light-clients/08-wasm/types/vm.go * Fix conflicts. --------- Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
cosmos · Nov 29, 2023 · 55f3b8f · 55f3b8f
1 parent 4a08ef9
commit 55f3b8f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/modules/light-clients/08-wasm/types/client_state.go b/modules/light-clients/08-wasm/types/client_state.go
@@ -168,7 +168,7 @@ func (cs ClientState) VerifyMembership(
 			Value:            value,
 		},
 	}
-	_, err := wasmSudo[EmptyResult](ctx, cdc, payload, clientStore, &cs)
+	_, err := wasmSudo[EmptyResult](ctx, cdc, clientStore, &cs, payload)
 	return err
 }
 
@@ -211,6 +211,6 @@ func (cs ClientState) VerifyNonMembership(
 			Path:             merklePath,
 		},
 	}
-	_, err := wasmSudo[EmptyResult](ctx, cdc, payload, clientStore, &cs)
+	_, err := wasmSudo[EmptyResult](ctx, cdc, clientStore, &cs, payload)
 	return err
 }
diff --git a/modules/light-clients/08-wasm/types/export_test.go b/modules/light-clients/08-wasm/types/export_test.go
@@ -46,7 +46,7 @@ func WasmQuery[T ContractResult](ctx sdk.Context, clientStore sdk.KVStore, cs *C
 
 // WasmSudo wraps wasmCall and is used solely for testing.
 func WasmSudo[T ContractResult](ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, cs *ClientState, payload SudoMsg) (T, error) {
-	return wasmSudo[T](ctx, cdc, payload, clientStore, cs)
+	return wasmSudo[T](ctx, cdc, clientStore, cs, payload)
 }
 
 // WasmInstantiate wraps wasmInstantiate and is used solely for testing.

diff --git a/modules/light-clients/08-wasm/types/proposal_handle.go b/modules/light-clients/08-wasm/types/proposal_handle.go
@@ -36,6 +36,6 @@ func (cs ClientState) CheckSubstituteAndUpdateState(ctx sdk.Context, cdc codec.B
 		MigrateClientStore: &MigrateClientStoreMsg{},
 	}
 
-	_, err := wasmSudo[EmptyResult](ctx, cdc, payload, store, &cs)
+	_, err := wasmSudo[EmptyResult](ctx, cdc, store, &cs, payload)
 	return err
 }
diff --git a/modules/light-clients/08-wasm/types/update.go b/modules/light-clients/08-wasm/types/update.go
@@ -42,7 +42,7 @@ func (cs ClientState) UpdateState(ctx sdk.Context, cdc codec.BinaryCodec, client
 		UpdateState: &UpdateStateMsg{ClientMessage: clientMessage},
 	}
 
-	result, err := wasmSudo[UpdateStateResult](ctx, cdc, payload, clientStore, &cs)
+	result, err := wasmSudo[UpdateStateResult](ctx, cdc, clientStore, &cs, payload)
 	if err != nil {
 		panic(err)
 	}
@@ -67,7 +67,7 @@ func (cs ClientState) UpdateStateOnMisbehaviour(ctx sdk.Context, cdc codec.Binar
 		UpdateStateOnMisbehaviour: &UpdateStateOnMisbehaviourMsg{ClientMessage: clientMessage},
 	}
 
-	_, err := wasmSudo[EmptyResult](ctx, cdc, payload, clientStore, &cs)
+	_, err := wasmSudo[EmptyResult](ctx, cdc, clientStore, &cs, payload)
 	if err != nil {
 		panic(err)
 	}

diff --git a/modules/light-clients/08-wasm/types/upgrade.go b/modules/light-clients/08-wasm/types/upgrade.go
@@ -51,6 +51,6 @@ func (cs ClientState) VerifyUpgradeAndUpdateState(
 		},
 	}
 
-	_, err := wasmSudo[EmptyResult](ctx, cdc, payload, clientStore, &cs)
+	_, err := wasmSudo[EmptyResult](ctx, cdc, clientStore, &cs, payload)
 	return err
 }
diff --git a/modules/light-clients/08-wasm/types/vm.go b/modules/light-clients/08-wasm/types/vm.go
@@ -142,7 +142,7 @@ func wasmInstantiate(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVS
 // - the response of the contract call contains non-empty events
 // - the response of the contract call contains non-empty attributes
 // - the data bytes of the response cannot be unmarshaled into the result type
-func wasmSudo[T ContractResult](ctx sdk.Context, cdc codec.BinaryCodec, payload SudoMsg, clientStore sdk.KVStore, cs *ClientState) (T, error) {
+func wasmSudo[T ContractResult](ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, cs *ClientState, payload SudoMsg) (T, error) {
 	var result T
 
 	encodedData, err := json.Marshal(payload)