Skip to content

Commit 04e2347

Browse files
ducphamle2ducphamle2
committed
chore: comment migrate msg
1 parent ffde7a4 commit 04e2347

File tree

3 files changed

+61
-61
lines changed

3 files changed

+61
-61
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -658,19 +658,19 @@ pub fn execute_delete_mapping_pair(
658658
}
659659

660660
#[entry_point]
661-
pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
661+
pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
662662
// we don't need to save anything if migrating from the same version
663-
CONFIG.save(
664-
deps.storage,
665-
&Config {
666-
default_timeout: msg.default_timeout,
667-
default_gas_limit: msg.default_gas_limit,
668-
fee_denom: msg.fee_denom,
669-
swap_router_contract: RouterController(msg.swap_router_contract),
670-
token_fee_receiver: deps.api.addr_validate(&msg.token_fee_receiver)?,
671-
relayer_fee_receiver: deps.api.addr_validate(&msg.relayer_fee_receiver)?,
672-
},
673-
)?;
663+
// CONFIG.save(
664+
// deps.storage,
665+
// &Config {
666+
// default_timeout: msg.default_timeout,
667+
// default_gas_limit: msg.default_gas_limit,
668+
// fee_denom: msg.fee_denom,
669+
// swap_router_contract: RouterController(msg.swap_router_contract),
670+
// token_fee_receiver: deps.api.addr_validate(&msg.token_fee_receiver)?,
671+
// relayer_fee_receiver: deps.api.addr_validate(&msg.relayer_fee_receiver)?,
672+
// },
673+
// )?;
674674
set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
675675
Ok(Response::new())
676676
}

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ mod test {
66
use oraiswap::router::{RouterController, SwapOperation};
77

88
use crate::ibc::{
9-
build_ibc_msg, build_swap_msgs, check_gas_limit, convert_remote_denom_to_evm_prefix,
10-
deduct_fee, deduct_relayer_fee, deduct_token_fee, get_token_price, ibc_packet_receive,
9+
build_ibc_msg, build_swap_msgs, convert_remote_denom_to_evm_prefix, deduct_fee,
10+
deduct_relayer_fee, deduct_token_fee, get_token_price, ibc_packet_receive,
1111
parse_ibc_channel_without_sanity_checks, parse_ibc_denom_without_sanity_checks,
1212
parse_voucher_denom, process_ibc_msg, Ics20Ack, Ics20Packet, FOLLOW_UP_IBC_SEND_FAILURE_ID,
1313
IBC_TRANSFER_NATIVE_ERROR_ID, NATIVE_RECEIVE_ID, SWAP_OPS_FAILURE_ID,
@@ -27,8 +27,8 @@ mod test {
2727
use cw20::{Cw20Coin, Cw20ExecuteMsg};
2828
use cw20_ics20_msg::amount::{convert_local_to_remote, Amount};
2929

30-
use crate::contract::{execute, migrate};
31-
use crate::msg::{ExecuteMsg, MigrateMsg, UpdatePairMsg};
30+
use crate::contract::execute;
31+
use crate::msg::{ExecuteMsg, UpdatePairMsg};
3232
use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
3333
use cosmwasm_std::{coins, to_vec};
3434

@@ -70,45 +70,45 @@ mod test {
7070
assert_eq!(expected, encdoded.as_str());
7171
}
7272

73-
#[test]
74-
fn check_gas_limit_handles_all_cases() {
75-
let send_channel = "channel-9";
76-
let allowed = "foobar";
77-
let allowed_gas = 777666;
78-
let mut deps = setup(&[send_channel], &[(allowed, allowed_gas)]);
79-
80-
// allow list will get proper gas
81-
let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, allowed)).unwrap();
82-
assert_eq!(limit, Some(allowed_gas));
83-
84-
// non-allow list will error
85-
let random = "tokenz";
86-
check_gas_limit(deps.as_ref(), &Amount::cw20(500, random)).unwrap_err();
87-
88-
// add default_gas_limit
89-
let def_limit = 54321;
90-
migrate(
91-
deps.as_mut(),
92-
mock_env(),
93-
MigrateMsg {
94-
default_gas_limit: Some(def_limit),
95-
token_fee_receiver: "receiver".to_string(),
96-
relayer_fee_receiver: "relayer_fee_receiver".to_string(),
97-
default_timeout: 100u64,
98-
fee_denom: "orai".to_string(),
99-
swap_router_contract: "foobar".to_string(),
100-
},
101-
)
102-
.unwrap();
103-
104-
// allow list still gets proper gas
105-
let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, allowed)).unwrap();
106-
assert_eq!(limit, Some(allowed_gas));
107-
108-
// non-allow list will now get default
109-
let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, random)).unwrap();
110-
assert_eq!(limit, Some(def_limit));
111-
}
73+
// #[test]
74+
// fn check_gas_limit_handles_all_cases() {
75+
// let send_channel = "channel-9";
76+
// let allowed = "foobar";
77+
// let allowed_gas = 777666;
78+
// let mut deps = setup(&[send_channel], &[(allowed, allowed_gas)]);
79+
80+
// // allow list will get proper gas
81+
// let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, allowed)).unwrap();
82+
// assert_eq!(limit, Some(allowed_gas));
83+
84+
// // non-allow list will error
85+
// let random = "tokenz";
86+
// check_gas_limit(deps.as_ref(), &Amount::cw20(500, random)).unwrap_err();
87+
88+
// // add default_gas_limit
89+
// let def_limit = 54321;
90+
// migrate(
91+
// deps.as_mut(),
92+
// mock_env(),
93+
// MigrateMsg {
94+
// // default_gas_limit: Some(def_limit),
95+
// // token_fee_receiver: "receiver".to_string(),
96+
// // relayer_fee_receiver: "relayer_fee_receiver".to_string(),
97+
// // default_timeout: 100u64,
98+
// // fee_denom: "orai".to_string(),
99+
// // swap_router_contract: "foobar".to_string(),
100+
// },
101+
// )
102+
// .unwrap();
103+
104+
// // allow list still gets proper gas
105+
// let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, allowed)).unwrap();
106+
// assert_eq!(limit, Some(allowed_gas));
107+
108+
// // non-allow list will now get default
109+
// let limit = check_gas_limit(deps.as_ref(), &Amount::cw20(500, random)).unwrap();
110+
// assert_eq!(limit, Some(def_limit));
111+
// }
112112

113113
// test remote chain send native token to local chain
114114
fn mock_receive_packet_remote_to_local(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ pub struct AllowMsg {
2929

3030
#[cw_serde]
3131
pub struct MigrateMsg {
32-
pub default_timeout: u64,
33-
pub default_gas_limit: Option<u64>,
34-
pub fee_denom: String,
35-
pub swap_router_contract: String,
36-
pub token_fee_receiver: String,
37-
pub relayer_fee_receiver: String,
32+
// pub default_timeout: u64,
33+
// pub default_gas_limit: Option<u64>,
34+
// pub fee_denom: String,
35+
// pub swap_router_contract: String,
36+
// pub token_fee_receiver: String,
37+
// pub relayer_fee_receiver: String,
3838
}
3939

4040
#[cw_serde]

0 commit comments

Comments
 (0)