@@ -79,8 +79,7 @@ mod request_replace_tests {
7979 old_vault_id : & VaultId ,
8080 new_vault_id : & VaultId ,
8181 issue : & IssueRequest < AccountId32 , BlockNumber , Balance , CurrencyId > ,
82- amount : Amount < Runtime > ,
83- fee : Amount < Runtime > ,
82+ redeem : & RedeemRequest < AccountId32 , BlockNumber , Balance , CurrencyId > ,
8483 ) {
8584 assert_eq ! (
8685 ParachainTwoVaultState :: get( & old_vault_id, & new_vault_id) ,
@@ -89,8 +88,8 @@ mod request_replace_tests {
8988 * old_vault. free_balance. get_mut( & issue. griefing_currency) . unwrap( ) -=
9089 Amount :: new( issue. griefing_collateral, issue. griefing_currency) ;
9190
92- old_vault. to_be_redeemed += amount - fee;
93- new_vault. to_be_issued += amount ;
91+ old_vault. to_be_redeemed += redeem . amount_btc ( ) - redeem . fee( ) ;
92+ new_vault. to_be_issued += redeem . amount_btc ( ) ;
9493 }
9594 )
9695 ) ;
@@ -118,13 +117,7 @@ mod request_replace_tests {
118117 let issue = IssuePallet :: get_issue_request_from_id ( & issue_id) . unwrap ( ) ;
119118
120119 assert_eq ! ( issue. griefing_collateral( ) , griefing( 0 ) ) ;
121- assert_state_after_accept_replace_correct (
122- & old_vault_id,
123- & new_vault_id,
124- & issue,
125- accept_amount,
126- redeem. fee ( ) ,
127- ) ;
120+ assert_state_after_accept_replace_correct ( & old_vault_id, & new_vault_id, & issue, & redeem) ;
128121 } ) ;
129122 }
130123
@@ -154,13 +147,7 @@ mod request_replace_tests {
154147 let issue = IssuePallet :: get_issue_request_from_id ( & issue_id) . unwrap ( ) ;
155148
156149 assert_eq ! ( issue. griefing_collateral( ) , griefing( 0 ) ) ;
157- assert_state_after_accept_replace_correct (
158- & old_vault_id,
159- & new_vault_id,
160- & issue,
161- accept_amount,
162- redeem. fee ( ) ,
163- ) ;
150+ assert_state_after_accept_replace_correct ( & old_vault_id, & new_vault_id, & issue, & redeem) ;
164151 } ) ;
165152 }
166153
0 commit comments