Skip to content

Commit 1ab5cbd

Browse files
nakul1010nakul1010
committed
fix: clippy warnings.
1 parent 4901c81 commit 1ab5cbd

1 file changed

Lines changed: 7 additions & 75 deletions

File tree

  • parachain/runtime/runtime-tests/src/parachain

‎parachain/runtime/runtime-tests/src/parachain/replace.rs‎

Lines changed: 7 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -100,27 +100,6 @@ mod request_replace_tests {
100100
issue: &IssueRequest<AccountId32, BlockNumber, Balance, CurrencyId>,
101101
amount: Amount<Runtime>,
102102
) {
103-
let result = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
104-
println!("--- result: {:#?} ---", result);
105-
let result = ParachainTwoVaultState::get_default(&old_vault_id, &new_vault_id);
106-
println!("--- result: {:#?} ---", result);
107-
108-
// let result = ParachainTwoVaultState::get_default(&old_vault_id, &new_vault_id).with_changes(
109-
// |old_vault, new_vault, _| {
110-
// *old_vault
111-
// .free_balance
112-
// .get_mut(&new_vault_id.collateral_currency())
113-
// .unwrap() -= Amount::new(issue.griefing_collateral, new_vault_id.collateral_currency());
114-
// // let issue_amount = issue.amount();
115-
// println!("---- issue_amount: {:?} ----",amount);
116-
//
117-
// old_vault.to_be_redeemed += amount;
118-
// new_vault.to_be_issued += amount;
119-
// }
120-
// );
121-
// println!("--- to_be_redeemed: {:#?} ---",result.vault1.to_be_redeemed);
122-
// println!("--- to_be_issued: {:#?} ---",result.vault2.to_be_issued);
123-
124103
assert_eq!(
125104
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
126105
ParachainTwoVaultState::get_default(&old_vault_id, &new_vault_id).with_changes(
@@ -139,7 +118,6 @@ mod request_replace_tests {
139118
fn integration_test_replace_accept_replace_at_capacity_succeeds() {
140119
test_with(|old_vault_id, new_vault_id| {
141120
let accept_amount = new_vault_id.wrapped(DEFAULT_VAULT_TO_BE_REPLACED.amount());
142-
println!("accept_amount: {:?},", accept_amount.amount());
143121
assert_ok!(RuntimeCall::Redeem(RedeemCall::request_replace {
144122
currency_pair: old_vault_id.currencies.clone(),
145123
amount: accept_amount.amount(),
@@ -157,9 +135,6 @@ mod request_replace_tests {
157135
let issue_id = assert_issue_request_event();
158136
let issue = IssuePallet::get_issue_request_from_id(&issue_id).unwrap();
159137

160-
println!("---- issue event: {:#?} -----", issue);
161-
// println!("---- redeem event: {:#?} ----",redeem);
162-
163138
assert_eq!(issue.griefing_collateral(), griefing(2));
164139
assert_state_after_accept_replace_correct(&old_vault_id, &new_vault_id, &issue, accept_amount);
165140
});
@@ -172,7 +147,6 @@ mod request_replace_tests {
172147

173148
let accept_amount = DEFAULT_VAULT_TO_BE_REPLACED / 4;
174149
let accept_amount = old_vault_id.wrapped(accept_amount.amount());
175-
println!("accept_amount: {:?}", accept_amount.amount());
176150

177151
assert_ok!(RuntimeCall::Redeem(RedeemCall::request_replace {
178152
currency_pair: old_vault_id.currencies.clone(),
@@ -191,9 +165,6 @@ mod request_replace_tests {
191165
let issue_id = assert_issue_request_event();
192166
let issue = IssuePallet::get_issue_request_from_id(&issue_id).unwrap();
193167

194-
println!("---- issue event: {:#?} -----", issue);
195-
// println!("---- redeem event: {:#?} ----",redeem);
196-
197168
assert_eq!(issue.griefing_collateral(), griefing(1));
198169
assert_state_after_accept_replace_correct(&old_vault_id, &new_vault_id, &issue, accept_amount);
199170
});
@@ -206,7 +177,6 @@ mod request_replace_tests {
206177

207178
let accept_amount = DEFAULT_VAULT_TO_BE_REPLACED * 4;
208179
let accept_amount = old_vault_id.wrapped(accept_amount.amount());
209-
println!("accept_amount: {:?}", accept_amount.amount());
210180

211181
assert_ok!(RuntimeCall::Redeem(RedeemCall::request_replace {
212182
currency_pair: old_vault_id.currencies.clone(),
@@ -218,14 +188,12 @@ mod request_replace_tests {
218188

219189
let redeem_id = assert_redeem_request_event();
220190
let redeem = RedeemPallet::get_open_redeem_request_from_id(&redeem_id).unwrap();
221-
println!("---- redeem event: {:#?} ----", redeem);
222191

223192
assert_eq!(redeem.amount_btc, accept_amount.amount() / 2);
224193
assert_eq!(redeem.issue_id.is_some(), true);
225194

226195
let issue_id = assert_issue_request_event();
227196
let issue = IssuePallet::get_issue_request_from_id(&issue_id).unwrap();
228-
println!("---- issue event: {:#?} -----", issue);
229197

230198
assert_eq!(issue.griefing_collateral(), griefing(4));
231199
assert_state_after_accept_replace_correct(
@@ -332,7 +300,6 @@ mod expiry_test {
332300
/// test replace created by accept
333301
fn test_with(initial_period: u32, execute: impl Fn((H256, H256))) {
334302
let amount_btc = wrapped(5_000);
335-
let griefing_collateral = griefing(1000);
336303
super::test_with(|old_vault_id, new_vault_id| {
337304
set_replace_period(initial_period);
338305
assert_ok!(RuntimeCall::Redeem(RedeemCall::request_replace {
@@ -610,11 +577,6 @@ fn integration_test_replace_execute_replace_success() {
610577
let pre_execute_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
611578

612579
assert_ok!(execute_replace(redeem_id));
613-
614-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
615-
616-
println!("---- old_state: {:#?} ----", pre_execute_state);
617-
println!("---- new_state: {:#?} ----", new_state);
618580
assert_eq!(
619581
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
620582
pre_execute_state.with_changes(|old_vault, new_vault, _| {
@@ -659,11 +621,6 @@ fn integration_test_replace_execute_replace_old_vault_liquidated() {
659621
let collateral_for_replace =
660622
calculate_replace_collateral(&old, redeem.amount_btc(), old_vault_id.collateral_currency());
661623

662-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
663-
664-
println!("---- old_state: {:#?} ----", pre_execution_state);
665-
println!("---- new_state: {:#?} ----", new_state);
666-
667624
assert_eq!(
668625
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
669626
pre_execution_state.with_changes(|old_vault, new_vault, liquidation_vault| {
@@ -692,23 +649,14 @@ fn integration_test_replace_execute_replace_new_vault_liquidated() {
692649
test_with(|old_vault_id, new_vault_id| {
693650
let accept_amount = new_vault_id.wrapped(10000);
694651

695-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
696-
697-
let old = CoreVaultData::vault(old_vault_id.clone());
652+
let (redeem_id, _redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
698653

699654
liquidate_vault(&new_vault_id);
700655

701656
let pre_execution_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
702657

703658
assert_ok!(execute_replace(redeem_id));
704659

705-
let collateral_for_replace =
706-
calculate_replace_collateral(&old, redeem.amount_btc(), old_vault_id.collateral_currency());
707-
708-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
709-
println!("---- old_state: {:#?} ----", pre_execution_state);
710-
println!("---- new_state: {:#?} ----", new_state);
711-
712660
assert_eq!(
713661
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
714662
pre_execution_state.with_changes(|old_vault, _new_vault, liquidation_vault| {
@@ -771,7 +719,7 @@ fn integration_test_replace_execute_replace_both_vaults_liquidated() {
771719
fn integration_test_replace_execute_replace_with_cancelled() {
772720
test_with(|old_vault_id, new_vault_id| {
773721
let accept_amount = new_vault_id.wrapped(10000);
774-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
722+
let (redeem_id, _redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
775723
cancel_replace(redeem_id);
776724
assert_err!(execute_replace(redeem_id), RedeemError::RedeemCancelled);
777725
});
@@ -781,12 +729,9 @@ fn integration_test_replace_execute_replace_with_cancelled() {
781729
fn integration_test_replace_cancel_replace_success() {
782730
test_with(|old_vault_id, new_vault_id| {
783731
let accept_amount = new_vault_id.wrapped(10000);
784-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
732+
let (redeem_id, _redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
785733
let pre_cancellation_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
786734
cancel_replace(redeem_id);
787-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
788-
println!("---- pre_cancellation_state: {:#?} ----", pre_cancellation_state);
789-
println!("---- new_state: {:#?} ----", new_state);
790735

791736
assert_eq!(
792737
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
@@ -816,9 +761,6 @@ fn integration_test_replace_cancel_replace_old_vault_liquidated() {
816761

817762
let collateral_for_replace =
818763
calculate_replace_collateral(&old, redeem.amount_btc(), old_vault_id.collateral_currency());
819-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
820-
println!("---- pre_cancellation_state: {:#?} ----", pre_cancellation_state);
821-
println!("---- new_state: {:#?} ----", new_state);
822764

823765
assert_eq!(
824766
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
@@ -842,16 +784,13 @@ fn integration_test_replace_cancel_replace_old_vault_liquidated() {
842784
fn integration_test_replace_cancel_replace_new_vault_liquidated() {
843785
test_with(|old_vault_id, new_vault_id| {
844786
let accept_amount = new_vault_id.wrapped(10000);
845-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
787+
let (redeem_id, _redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
846788

847789
liquidate_vault(&new_vault_id);
848790

849791
let pre_cancellation_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
850792

851793
cancel_replace(redeem_id);
852-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
853-
println!("---- pre_cancellation_state: {:#?} ----", pre_cancellation_state);
854-
println!("---- new_state: {:#?} ----", new_state);
855794

856795
assert_eq!(
857796
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
@@ -881,9 +820,6 @@ fn integration_test_replace_cancel_replace_both_vaults_liquidated() {
881820
let pre_cancellation_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
882821

883822
cancel_replace(redeem_id);
884-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
885-
println!("---- pre_cancellation_state: {:#?} ----", pre_cancellation_state);
886-
println!("---- new_state: {:#?} ----", new_state);
887823

888824
let collateral_for_replace =
889825
calculate_replace_collateral(&old, redeem.amount_btc(), old_vault_id.collateral_currency());
@@ -931,15 +867,11 @@ fn integration_test_replace_vault_with_different_currency_succeeds() {
931867
CoreVaultData::force_to(&new_vault_id, default_vault_state(&new_vault_id));
932868

933869
let accept_amount = new_vault_id.wrapped(10000);
934-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
870+
let (redeem_id, _redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
935871

936872
let pre_execute_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
937873

938874
assert_ok!(execute_replace(redeem_id));
939-
let new_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id);
940-
941-
println!("---- pre_execute_state: {:#?} ----", pre_execute_state);
942-
println!("---- new_state: {:#?} ----", new_state);
943875

944876
assert_eq!(
945877
ParachainTwoVaultState::get(&old_vault_id, &new_vault_id),
@@ -993,7 +925,7 @@ mod oracle_down {
993925
fn no_oracle_cancel_replace_succeeds() {
994926
test_with(|old_vault_id, new_vault_id| {
995927
let accept_amount = new_vault_id.wrapped(10000);
996-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
928+
let (redeem_id, _redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
997929

998930
OraclePallet::expire_all();
999931

@@ -1012,7 +944,7 @@ mod oracle_down {
1012944
fn no_oracle_execute_cancelled_replace_succeeds() {
1013945
test_with(|old_vault_id, new_vault_id| {
1014946
let accept_amount = new_vault_id.wrapped(10000);
1015-
let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
947+
let (redeem_id, _redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id);
1016948

1017949
OraclePallet::expire_all();
1018950
assert_ok!(execute_replace(redeem_id));

0 commit comments

Comments
 (0)