@@ -61,7 +61,6 @@ type WasmVMResponseHandler interface {
6161 Handle (
6262 ctx sdk.Context ,
6363 contractAddr sdk.AccAddress ,
64- ibcPort string ,
6564 messages []wasmvmtypes.SubMsg ,
6665 origRspData []byte ,
6766 info wasmvmtypes.MessageInfo ,
@@ -372,7 +371,7 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A
372371 sdk .NewAttribute (types .AttributeKeyCodeID , strconv .FormatUint (codeID , 10 )),
373372 ))
374373
375- data , err := k .handleContractResponse (ctx , contractAddress , contractInfo . IBCPortID , res .Messages , res .Attributes , res .Data , res .Events , info , codeInfo )
374+ data , err := k .handleContractResponse (ctx , contractAddress , res .Messages , res .Attributes , res .Data , res .Events , info , codeInfo )
376375 if err != nil {
377376 return nil , nil , sdkerrors .Wrap (err , "dispatch" )
378377 }
@@ -420,7 +419,7 @@ func (k Keeper) execute(ctx sdk.Context, contractAddress sdk.AccAddress, caller
420419 sdk .NewAttribute (types .AttributeKeyContractAddr , contractAddress .String ()),
421420 ))
422421
423- data , err := k .handleContractResponse (ctx , contractAddress , contractInfo . IBCPortID , res .Messages , res .Attributes , res .Data , res .Events , info , codeInfo )
422+ data , err := k .handleContractResponse (ctx , contractAddress , res .Messages , res .Attributes , res .Data , res .Events , info , codeInfo )
424423 if err != nil {
425424 return nil , sdkerrors .Wrap (err , "dispatch" )
426425 }
@@ -489,7 +488,7 @@ func (k Keeper) migrate(ctx sdk.Context, contractAddress sdk.AccAddress, caller
489488 sdk .NewAttribute (types .AttributeKeyContractAddr , contractAddress .String ()),
490489 ))
491490
492- data , err := k .handleContractResponse (ctx , contractAddress , contractInfo . IBCPortID , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, * newCodeInfo )
491+ data , err := k .handleContractResponse (ctx , contractAddress , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, * newCodeInfo )
493492 if err != nil {
494493 return nil , err
495494 }
@@ -530,7 +529,7 @@ func (k Keeper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte
530529 sdk .NewAttribute (types .AttributeKeyContractAddr , contractAddress .String ()),
531530 ))
532531
533- data , err := k .handleContractResponse (ctx , contractAddress , contractInfo . IBCPortID , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, codeInfo )
532+ data , err := k .handleContractResponse (ctx , contractAddress , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, codeInfo )
534533 if err != nil {
535534 return nil , sdkerrors .Wrap (err , "dispatch" )
536535 }
@@ -540,7 +539,7 @@ func (k Keeper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte
540539
541540// reply is only called from keeper internal functions (dispatchSubmessages) after processing the submessage
542541func (k Keeper ) reply (ctx sdk.Context , contractAddress sdk.AccAddress , reply wasmvmtypes.Reply ) ([]byte , error ) {
543- contractInfo , codeInfo , prefixStore , err := k .contractInstance (ctx , contractAddress )
542+ _ , codeInfo , prefixStore , err := k .contractInstance (ctx , contractAddress )
544543 if err != nil {
545544 return nil , err
546545 }
@@ -565,7 +564,7 @@ func (k Keeper) reply(ctx sdk.Context, contractAddress sdk.AccAddress, reply was
565564 sdk .NewAttribute (types .AttributeKeyContractAddr , contractAddress .String ()),
566565 ))
567566
568- data , err := k .handleContractResponse (ctx , contractAddress , contractInfo . IBCPortID , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, codeInfo )
567+ data , err := k .handleContractResponse (ctx , contractAddress , res .Messages , res .Attributes , res .Data , res .Events , wasmvmtypes.MessageInfo {}, codeInfo )
569568 if err != nil {
570569 return nil , sdkerrors .Wrap (err , "dispatch" )
571570 }
@@ -984,7 +983,6 @@ func (k Keeper) setAccessConfig(ctx sdk.Context, codeID uint64, config types.Acc
984983func (k * Keeper ) handleContractResponse (
985984 ctx sdk.Context ,
986985 contractAddr sdk.AccAddress ,
987- ibcPort string ,
988986 msgs []wasmvmtypes.SubMsg ,
989987 attrs []wasmvmtypes.EventAttribute ,
990988 data []byte ,
@@ -1014,7 +1012,7 @@ func (k *Keeper) handleContractResponse(
10141012 if err != nil {
10151013 return nil , err
10161014 }
1017- return k .wasmVMResponseHandler .Handle (ctx , contractAddr , ibcPort , msgs , data , info , codeInfo )
1015+ return k .wasmVMResponseHandler .Handle (ctx , contractAddr , msgs , data , info , codeInfo )
10181016}
10191017
10201018func (k Keeper ) runtimeGasForContract (ctx sdk.Context ) uint64 {
@@ -1229,7 +1227,7 @@ func (c BankCoinTransferrer) TransferCoins(parentCtx sdk.Context, fromAddr sdk.A
12291227}
12301228
12311229type msgDispatcher interface {
1232- DispatchSubmessages (ctx sdk.Context , contractAddr sdk.AccAddress , ibcPort string , msgs []wasmvmtypes.SubMsg , info wasmvmtypes.MessageInfo , codeInfo types.CodeInfo ) ([]byte , error )
1230+ DispatchSubmessages (ctx sdk.Context , contractAddr sdk.AccAddress , msgs []wasmvmtypes.SubMsg , info wasmvmtypes.MessageInfo , codeInfo types.CodeInfo ) ([]byte , error )
12331231}
12341232
12351233// DefaultWasmVMContractResponseHandler default implementation that first dispatches submessage then normal messages.
@@ -1244,9 +1242,9 @@ func NewDefaultWasmVMContractResponseHandler(md msgDispatcher) *DefaultWasmVMCon
12441242}
12451243
12461244// Handle processes the data returned by a contract invocation.
1247- func (h DefaultWasmVMContractResponseHandler ) Handle (ctx sdk.Context , contractAddr sdk.AccAddress , ibcPort string , messages []wasmvmtypes.SubMsg , origRspData []byte , info wasmvmtypes.MessageInfo , codeInfo types.CodeInfo ) ([]byte , error ) {
1245+ func (h DefaultWasmVMContractResponseHandler ) Handle (ctx sdk.Context , contractAddr sdk.AccAddress , messages []wasmvmtypes.SubMsg , origRspData []byte , info wasmvmtypes.MessageInfo , codeInfo types.CodeInfo ) ([]byte , error ) {
12481246 result := origRspData
1249- switch rsp , err := h .md .DispatchSubmessages (ctx , contractAddr , ibcPort , messages , info , codeInfo ); {
1247+ switch rsp , err := h .md .DispatchSubmessages (ctx , contractAddr , messages , info , codeInfo ); {
12501248 case err != nil :
12511249 return nil , err
12521250 case rsp != nil :
0 commit comments