removed forward params for channel balance

Author: ducphamle2

contracts/cw-ics20-latest/src/contract.rs

@@ -206,7 +206,6 @@ pub fn handle_increase_channel_balance_ibc_receive(
         &dst_channel_id,
         &ibc_denom,
         remote_amount.clone(),
-        false,
     )?;
     // we need to save the data to update the balances in reply
     let reply_args = ReplyArgs {
@@ -236,14 +235,8 @@ pub fn handle_reduce_channel_balance_ibc_receive(
 ) -> Result<Response, ContractError> {
     is_caller_contract(caller, contract_addr)?;
     // because we are transferring back, we reduce the channel's balance
-    reduce_channel_balance(
-        storage,
-        src_channel_id.as_str(),
-        &ibc_denom,
-        remote_amount,
-        false,
-    )
-    .map_err(|err| StdError::generic_err(err.to_string()))?;
+    reduce_channel_balance(storage, src_channel_id.as_str(), &ibc_denom, remote_amount)
+        .map_err(|err| StdError::generic_err(err.to_string()))?;
 
     // keep track of the single-step reply since we need ibc data to undo reducing channel balance and local data for refunding.
     // we use a different item to not override REPLY_ARGS
@@ -505,7 +498,6 @@ pub fn execute_transfer_back_to_remote_chain(
         &msg.local_channel_id,
         &ibc_denom,
         amount_remote,
-        false,
     )?;
 
     // prepare ibc message
@@ -673,7 +665,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
         QueryMsg::Port {} => to_binary(&query_port(deps)?),
         QueryMsg::ListChannels {} => to_binary(&query_list(deps)?),
-        QueryMsg::Channel { id, forward } => to_binary(&query_channel(deps, id)?),
+        QueryMsg::Channel { id } => to_binary(&query_channel(deps, id)?),
         QueryMsg::ChannelWithKey { channel_id, denom } => {
             to_binary(&query_channel_with_key(deps, channel_id, denom)?)
         }
@@ -949,7 +941,6 @@ mod test {
             mock_env(),
             QueryMsg::Channel {
                 id: "channel-3".to_string(),
-                forward: Some(true),
             },
         )
         .unwrap();
@@ -963,7 +954,6 @@ mod test {
             mock_env(),
             QueryMsg::Channel {
                 id: "channel-10".to_string(),
-                forward: Some(true),
             },
         )
         .unwrap_err();
@@ -2027,13 +2017,12 @@ mod test {
         let amount = Uint128::from(10u128);
         let reduce_amount = Uint128::from(1u128);
         let mut deps = setup(&[channel], &[]);
-        increase_channel_balance(deps.as_mut().storage, channel, ibc_denom, amount, false).unwrap();
+        increase_channel_balance(deps.as_mut().storage, channel, ibc_denom, amount).unwrap();
         reduce_channel_balance(
             deps.as_mut().storage,
             channel,
             ibc_denom,
             Uint128::from(1u128),
-            false,
         )
         .unwrap();
 
@@ -2062,7 +2051,7 @@ mod test {
         let override_amount = Uint128::from(100u128);
         let total_sent_override = Uint128::from(1000u128);
         let mut deps = setup(&[channel], &[]);
-        increase_channel_balance(deps.as_mut().storage, channel, ibc_denom, amount, false).unwrap();
+        increase_channel_balance(deps.as_mut().storage, channel, ibc_denom, amount).unwrap();
 
         // unauthorized case
         let unauthorized = handle_override_channel_balance(

contracts/cw-ics20-latest/src/ibc_tests.rs

@@ -611,7 +611,6 @@ mod test {
             receive_channel,
             pair_mapping_key.as_str(),
             remote_amount.clone(),
-            false,
         )
         .unwrap();
         destination.receiver = "trx-mainnet0x73Ddc880916021EFC4754Cb42B53db6EAB1f9D64".to_string();

contracts/cw-ics20-latest/src/msg.rs

@@ -153,7 +153,7 @@ pub enum QueryMsg {
     ListChannels {},
     /// Returns the details of the name channel, error if not created.
     #[returns(ChannelResponse)]
-    Channel { id: String, forward: Option<bool> },
+    Channel { id: String },
     /// Returns the details of the name channel, error if not created.
     #[returns(ChannelWithKeyResponse)]
     ChannelWithKey { channel_id: String, denom: String },

contracts/cw-ics20-latest/src/state.rs

@@ -142,13 +142,8 @@ pub fn increase_channel_balance(
     channel: &str,
     denom: &str, // should be ibc denom
     amount: Uint128,
-    _forward: bool,
 ) -> Result<(), ContractError> {
     let state = CHANNEL_REVERSE_STATE;
-    // if forward {
-    //     state = CHANNEL_FORWARD_STATE;
-    // }
-
     state.update(storage, (channel, denom), |orig| -> StdResult<_> {
         let mut state = orig.unwrap_or_default();
         state.outstanding += amount;
@@ -163,12 +158,8 @@ pub fn reduce_channel_balance(
     channel: &str,
     denom: &str, // should be ibc denom
     amount: Uint128,
-    _forward: bool,
 ) -> Result<(), ContractError> {
     let state = CHANNEL_REVERSE_STATE;
-    // if forward {
-    //     state = CHANNEL_FORWARD_STATE;
-    // }
     state.update(
         storage,
         (channel, denom),