@@ -44,9 +44,6 @@ fn test_with<R>(execute: impl Fn(VaultId) -> R) {
4444 test_with ( LendToken ( 1 ) , Token ( IBTC ) , None ) ;
4545}
4646
47- /// to-be-replaced & replace_collateral are decreased in request_redeem
48- fn consume_to_be_replaced ( vault : & mut CoreVaultData , amount_btc : Amount < Runtime > ) { }
49-
5047mod spec_based_tests {
5148 use primitives:: VaultCurrencyPair ;
5249
@@ -105,7 +102,6 @@ mod spec_based_tests {
105102 redeem. amount_btc( ) + redeem. transfer_fee_btc( ) + redeem. fee( ) ;
106103 ( * user. balances. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) . locked +=
107104 redeem. amount_btc( ) + redeem. transfer_fee_btc( ) + redeem. fee( ) ;
108- consume_to_be_replaced( vault, redeem. amount_btc( ) ) ;
109105 } )
110106 ) ;
111107 } ) ;
@@ -1148,7 +1144,6 @@ fn integration_test_redeem_execute_succeeds() {
11481144 vault. issued -= redeem. amount_btc( ) + redeem. transfer_fee_btc( ) ;
11491145 ( * user. balances. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) . free -= issued_tokens;
11501146 * fee_pool. rewards_for( & vault_id) += redeem. fee( ) ;
1151- consume_to_be_replaced( vault, redeem. amount_btc( ) + redeem. transfer_fee_btc( ) ) ;
11521147 } )
11531148 ) ;
11541149 } ) ;
@@ -1232,7 +1227,6 @@ fn integration_test_premium_redeem_wrapped_execute() {
12321227 // premium is moved from vault to user
12331228 vault. backing_collateral -= redeem. premium( ) . unwrap( ) ;
12341229 ( * user. balances. get_mut( & currency_id) . unwrap( ) ) . free += redeem. premium( ) . unwrap( ) ;
1235- consume_to_be_replaced( vault, burned_amount) ;
12361230 } )
12371231 ) ;
12381232
@@ -1436,8 +1430,6 @@ fn integration_test_redeem_wrapped_cancel_reimburse_sufficient_collateral_for_wr
14361430 ( * user. balances. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) . free -= amount_btc;
14371431
14381432 * fee_pool. rewards_for( & vault_id) += redeem. fee( ) ;
1439-
1440- consume_to_be_replaced( vault, redeem. amount_btc( ) + redeem. transfer_fee_btc( ) ) ;
14411433 } )
14421434 ) ;
14431435 } ) ;
@@ -1489,8 +1481,6 @@ fn integration_test_redeem_wrapped_cancel_reimburse_insufficient_collateral_for_
14891481 ( * user. balances. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) . free -= amount_btc;
14901482
14911483 * fee_pool. rewards_for( & vault_id) += redeem. fee( ) ;
1492-
1493- consume_to_be_replaced( vault, redeem. amount_btc( ) + redeem. transfer_fee_btc( ) ) ;
14941484 } )
14951485 ) ;
14961486
@@ -1548,8 +1538,6 @@ fn integration_test_redeem_wrapped_cancel_no_reimburse() {
15481538 ( * user. balances. get_mut( & currency_id) . unwrap( ) ) . free += punishment_fee;
15491539
15501540 vault. backing_collateral -= punishment_fee;
1551-
1552- consume_to_be_replaced( vault, redeem. amount_btc( ) + redeem. transfer_fee_btc( ) ) ;
15531541 } )
15541542 ) ;
15551543 } ) ;
@@ -1995,7 +1983,6 @@ mod self_redeem {
19951983 vault. issued -= consumed_issued_tokens;
19961984 ( * vault. free_balance. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) -= issued_tokens;
19971985 * fee_pool. rewards_for( & vault_id) += fee;
1998- consume_to_be_replaced( vault, consumed_issued_tokens) ;
19991986 } )
20001987 ) ;
20011988 } ) ;
@@ -2018,7 +2005,6 @@ mod self_redeem {
20182005 ParachainState :: get_default( & vault_id) . with_changes( |_, vault, _, _| {
20192006 vault. issued -= issued_tokens;
20202007 ( * vault. free_balance. get_mut( & vault_id. wrapped_currency( ) ) . unwrap( ) ) -= issued_tokens;
2021- consume_to_be_replaced( vault, issued_tokens) ;
20222008 } )
20232009 ) ;
20242010 } ) ;
0 commit comments