Skip to content

Commit a753ae1

Browse files
committed
Remove IbcFullAcknowledgement from async ack
1 parent 42a553e commit a753ae1

File tree

6 files changed

+21
-76
lines changed

6 files changed

+21
-76
lines changed

contracts/ibc-reflect-send/schema/ibc-reflect-send.json

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -402,25 +402,14 @@
402402
}
403403
]
404404
},
405-
"IbcFullAcknowledgement": {
406-
"description": "The acknowledgement written by the module on the destination chain. It is different from the [`crate::IbcAcknowledgement`] as it can be unsuccessful.",
405+
"IbcAcknowledgement": {
407406
"type": "object",
408407
"required": [
409-
"data",
410-
"success"
408+
"data"
411409
],
412410
"properties": {
413411
"data": {
414-
"description": "The acknowledgement data returned by the module.",
415-
"allOf": [
416-
{
417-
"$ref": "#/definitions/Binary"
418-
}
419-
]
420-
},
421-
"success": {
422-
"description": "Whether the acknowledgement was successful or not.",
423-
"type": "boolean"
412+
"$ref": "#/definitions/Binary"
424413
}
425414
},
426415
"additionalProperties": false
@@ -535,7 +524,7 @@
535524
"description": "The acknowledgement to send back",
536525
"allOf": [
537526
{
538-
"$ref": "#/definitions/IbcFullAcknowledgement"
527+
"$ref": "#/definitions/IbcAcknowledgement"
539528
}
540529
]
541530
},

contracts/ibc-reflect-send/schema/ibc/packet_msg.json

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -343,25 +343,14 @@
343343
}
344344
]
345345
},
346-
"IbcFullAcknowledgement": {
347-
"description": "The acknowledgement written by the module on the destination chain. It is different from the [`crate::IbcAcknowledgement`] as it can be unsuccessful.",
346+
"IbcAcknowledgement": {
348347
"type": "object",
349348
"required": [
350-
"data",
351-
"success"
349+
"data"
352350
],
353351
"properties": {
354352
"data": {
355-
"description": "The acknowledgement data returned by the module.",
356-
"allOf": [
357-
{
358-
"$ref": "#/definitions/Binary"
359-
}
360-
]
361-
},
362-
"success": {
363-
"description": "Whether the acknowledgement was successful or not.",
364-
"type": "boolean"
353+
"$ref": "#/definitions/Binary"
365354
}
366355
},
367356
"additionalProperties": false
@@ -476,7 +465,7 @@
476465
"description": "The acknowledgement to send back",
477466
"allOf": [
478467
{
479-
"$ref": "#/definitions/IbcFullAcknowledgement"
468+
"$ref": "#/definitions/IbcAcknowledgement"
480469
}
481470
]
482471
},

contracts/ibc-reflect-send/schema/raw/execute.json

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -391,25 +391,14 @@
391391
}
392392
]
393393
},
394-
"IbcFullAcknowledgement": {
395-
"description": "The acknowledgement written by the module on the destination chain. It is different from the [`crate::IbcAcknowledgement`] as it can be unsuccessful.",
394+
"IbcAcknowledgement": {
396395
"type": "object",
397396
"required": [
398-
"data",
399-
"success"
397+
"data"
400398
],
401399
"properties": {
402400
"data": {
403-
"description": "The acknowledgement data returned by the module.",
404-
"allOf": [
405-
{
406-
"$ref": "#/definitions/Binary"
407-
}
408-
]
409-
},
410-
"success": {
411-
"description": "Whether the acknowledgement was successful or not.",
412-
"type": "boolean"
401+
"$ref": "#/definitions/Binary"
413402
}
414403
},
415404
"additionalProperties": false
@@ -524,7 +513,7 @@
524513
"description": "The acknowledgement to send back",
525514
"allOf": [
526515
{
527-
"$ref": "#/definitions/IbcFullAcknowledgement"
516+
"$ref": "#/definitions/IbcAcknowledgement"
528517
}
529518
]
530519
},

contracts/ibc-reflect/src/contract.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use cosmwasm_std::{
22
entry_point, from_json, to_json_binary, wasm_execute, BankMsg, Binary, CosmosMsg, Deps,
3-
DepsMut, Empty, Env, Event, Ibc3ChannelOpenResponse, IbcBasicResponse, IbcChannelCloseMsg,
4-
IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcFullAcknowledgement,
5-
IbcMsg, IbcOrder, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg,
6-
IbcReceiveResponse, MessageInfo, Never, QueryResponse, Reply, Response, StdError, StdResult,
7-
SubMsg, SubMsgResponse, SubMsgResult, WasmMsg,
3+
DepsMut, Empty, Env, Event, Ibc3ChannelOpenResponse, IbcAcknowledgement, IbcBasicResponse,
4+
IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcMsg,
5+
IbcOrder, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg, IbcReceiveResponse,
6+
MessageInfo, Never, QueryResponse, Reply, Response, StdError, StdResult, SubMsg,
7+
SubMsgResponse, SubMsgResult, WasmMsg,
88
};
99

1010
use crate::msg::{
@@ -56,7 +56,7 @@ pub fn execute(
5656
fn execute_async_ack(
5757
channel_id: String,
5858
packet_sequence: u64,
59-
ack: IbcFullAcknowledgement,
59+
ack: IbcAcknowledgement,
6060
) -> StdResult<Response> {
6161
Ok(Response::new().add_message(IbcMsg::WriteAcknowledgement {
6262
channel_id,

contracts/ibc-reflect/src/msg.rs

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cosmwasm_schema::{cw_serde, QueryResponses};
2-
use cosmwasm_std::{Coin, CosmosMsg, IbcFullAcknowledgement, Uint64};
2+
use cosmwasm_std::{Coin, CosmosMsg, IbcAcknowledgement, Uint64};
33

44
/// Just needs to know the code_id of a reflect contract to spawn sub-accounts
55
#[cw_serde]
@@ -15,7 +15,7 @@ pub enum ExecuteMsg {
1515
/// Sequence number of the packet that was received
1616
packet_sequence: Uint64,
1717
/// The acknowledgement to send back
18-
ack: IbcFullAcknowledgement,
18+
ack: IbcAcknowledgement,
1919
},
2020
}
2121

@@ -116,25 +116,3 @@ pub struct BalancesResponse {
116116
/// This is the success response we send on ack for PacketMsg::ReturnMsgs.
117117
/// Just acknowledge success or error
118118
pub type ReturnMsgsResponse = ();
119-
120-
#[cfg(test)]
121-
mod tests {
122-
use cosmwasm_std::from_json;
123-
124-
use super::*;
125-
126-
#[test]
127-
fn test_serde_packet_msg() {
128-
let packet_msg = PacketMsg::AsyncAck {
129-
channel_id: "channel-0".to_string(),
130-
packet_sequence: Uint64(1),
131-
ack: IbcFullAcknowledgement {
132-
data: Some(b"my ack".to_vec()),
133-
..Default::default()
134-
},
135-
};
136-
137-
let json = r#"{"async_ack":{"channel_id":"channel-0","packet_sequence": 1, "ack": {"data":"my ack", "success": true}}}"#;
138-
let packet_msg: PacketMsg = from_json(json).unwrap();
139-
}
140-
}

packages/std/src/ibc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub enum IbcMsg {
6969
/// Sequence number of the packet that was received
7070
packet_sequence: u64,
7171
/// The acknowledgement to send back
72-
ack: IbcFullAcknowledgement,
72+
ack: IbcAcknowledgement,
7373
},
7474
/// This will close an existing channel that is owned by this contract.
7575
/// Port is auto-assigned to the contract's IBC port

0 commit comments

Comments
 (0)