chore: Call only MigrateWithInfo and move arity check to cw-vm

CosmWasm · Aug 28, 2024 · ef8f438 · ef8f438
1 parent 797cfa0
commit ef8f438
Show file tree

Hide file tree

Showing 3 changed files with 284 additions and 275 deletions.
diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go
@@ -572,24 +572,7 @@ func (k Keeper) callMigrateEntrypoint(
 		Sender:            senderAddress.String(),
 		OldMigrateVersion: OldMigrateVersion,
 	}
-	var res *wasmvmtypes.ContractResult
-	var gasUsed uint64
-	var err error
-	if OldMigrateVersion == nil {
-		res, gasUsed, err = k.wasmVM.Migrate(newChecksum, env, msg, vmStore, cosmwasmAPI, &querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
-		if err != nil {
-			if strings.Contains(err.Error(), "The called function args arity does not match") {
-				res, gasUsed, err = k.wasmVM.MigrateWithInfo(newChecksum, env, msg, migrateInfo, vmStore, cosmwasmAPI, &querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
-			}
-		}
-	} else {
-		res, gasUsed, err = k.wasmVM.MigrateWithInfo(newChecksum, env, msg, migrateInfo, vmStore, cosmwasmAPI, &querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
-		if err != nil {
-			if strings.Contains(err.Error(), "The called function args arity does not match") {
-				res, gasUsed, err = k.wasmVM.Migrate(newChecksum, env, msg, vmStore, cosmwasmAPI, &querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
-			}
-		}
-	}
+	res, gasUsed, err := k.wasmVM.MigrateWithInfo(newChecksum, env, msg, migrateInfo, vmStore, cosmwasmAPI, &querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
 
 	k.consumeRuntimeGas(sdkCtx, gasUsed)
 	if err != nil {