@@ -589,8 +589,9 @@ mod tests {
589
589
let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
590
590
let invoice = invoice ( payment_preimage) ;
591
591
let payment_hash = PaymentHash ( invoice. payment_hash ( ) . clone ( ) . into_inner ( ) ) ;
592
+ let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
592
593
593
- let payer = TestPayer :: new ( ) ;
594
+ let payer = TestPayer :: new ( ) . expect_send ( Amount :: ForInvoice ( final_value_msat ) ) ;
594
595
let router = TestRouter { } ;
595
596
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
596
597
let logger = TestLogger :: new ( ) ;
@@ -618,8 +619,8 @@ mod tests {
618
619
let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
619
620
620
621
let payer = TestPayer :: new ( )
621
- . expect_value_msat ( final_value_msat)
622
- . expect_value_msat ( final_value_msat / 2 ) ;
622
+ . expect_send ( Amount :: ForInvoice ( final_value_msat) )
623
+ . expect_send ( Amount :: OnRetry ( final_value_msat / 2 ) ) ;
623
624
let router = TestRouter { } ;
624
625
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
625
626
let logger = TestLogger :: new ( ) ;
@@ -660,7 +661,9 @@ mod tests {
660
661
let payment_hash = PaymentHash ( invoice. payment_hash ( ) . clone ( ) . into_inner ( ) ) ;
661
662
let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
662
663
663
- let payer = TestPayer :: new ( ) ;
664
+ let payer = TestPayer :: new ( )
665
+ . expect_send ( Amount :: OnRetry ( final_value_msat / 2 ) )
666
+ . expect_send ( Amount :: OnRetry ( final_value_msat / 2 ) ) ;
664
667
let router = TestRouter { } ;
665
668
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
666
669
let logger = TestLogger :: new ( ) ;
@@ -703,9 +706,9 @@ mod tests {
703
706
let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
704
707
705
708
let payer = TestPayer :: new ( )
706
- . expect_value_msat ( final_value_msat)
707
- . expect_value_msat ( final_value_msat / 2 )
708
- . expect_value_msat ( final_value_msat / 2 ) ;
709
+ . expect_send ( Amount :: ForInvoice ( final_value_msat) )
710
+ . expect_send ( Amount :: OnRetry ( final_value_msat / 2 ) )
711
+ . expect_send ( Amount :: OnRetry ( final_value_msat / 2 ) ) ;
709
712
let router = TestRouter { } ;
710
713
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
711
714
let logger = TestLogger :: new ( ) ;
@@ -755,15 +758,17 @@ mod tests {
755
758
let event_handled = core:: cell:: RefCell :: new ( false ) ;
756
759
let event_handler = |_: & _ | { * event_handled. borrow_mut ( ) = true ; } ;
757
760
758
- let payer = TestPayer :: new ( ) ;
761
+ let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
762
+ let invoice = invoice ( payment_preimage) ;
763
+ let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
764
+
765
+ let payer = TestPayer :: new ( ) . expect_send ( Amount :: ForInvoice ( final_value_msat) ) ;
759
766
let router = TestRouter { } ;
760
767
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
761
768
let logger = TestLogger :: new ( ) ;
762
769
let invoice_payer =
763
770
InvoicePayer :: new ( & payer, router, & scorer, & logger, event_handler, RetryAttempts ( 2 ) ) ;
764
771
765
- let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
766
- let invoice = invoice ( payment_preimage) ;
767
772
let payment_id = Some ( invoice_payer. pay_invoice ( & invoice) . unwrap ( ) ) ;
768
773
assert_eq ! ( * payer. attempts. borrow( ) , 1 ) ;
769
774
@@ -806,15 +811,17 @@ mod tests {
806
811
let event_handled = core:: cell:: RefCell :: new ( false ) ;
807
812
let event_handler = |_: & _ | { * event_handled. borrow_mut ( ) = true ; } ;
808
813
809
- let payer = TestPayer :: new ( ) ;
814
+ let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
815
+ let invoice = invoice ( payment_preimage) ;
816
+ let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
817
+
818
+ let payer = TestPayer :: new ( ) . expect_send ( Amount :: ForInvoice ( final_value_msat) ) ;
810
819
let router = TestRouter { } ;
811
820
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
812
821
let logger = TestLogger :: new ( ) ;
813
822
let invoice_payer =
814
823
InvoicePayer :: new ( & payer, router, & scorer, & logger, event_handler, RetryAttempts ( 2 ) ) ;
815
824
816
- let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
817
- let invoice = invoice ( payment_preimage) ;
818
825
let payment_id = Some ( invoice_payer. pay_invoice ( & invoice) . unwrap ( ) ) ;
819
826
assert_eq ! ( * payer. attempts. borrow( ) , 1 ) ;
820
827
@@ -848,7 +855,7 @@ mod tests {
848
855
849
856
let payer = TestPayer :: new ( )
850
857
. fails_on_attempt ( 2 )
851
- . expect_value_msat ( final_value_msat) ;
858
+ . expect_send ( Amount :: ForInvoice ( final_value_msat) ) ;
852
859
let router = TestRouter { } ;
853
860
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
854
861
let logger = TestLogger :: new ( ) ;
@@ -878,15 +885,17 @@ mod tests {
878
885
let event_handled = core:: cell:: RefCell :: new ( false ) ;
879
886
let event_handler = |_: & _ | { * event_handled. borrow_mut ( ) = true ; } ;
880
887
881
- let payer = TestPayer :: new ( ) ;
888
+ let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
889
+ let invoice = invoice ( payment_preimage) ;
890
+ let final_value_msat = invoice. amount_milli_satoshis ( ) . unwrap ( ) ;
891
+
892
+ let payer = TestPayer :: new ( ) . expect_send ( Amount :: ForInvoice ( final_value_msat) ) ;
882
893
let router = TestRouter { } ;
883
894
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
884
895
let logger = TestLogger :: new ( ) ;
885
896
let invoice_payer =
886
897
InvoicePayer :: new ( & payer, router, & scorer, & logger, event_handler, RetryAttempts ( 2 ) ) ;
887
898
888
- let payment_preimage = PaymentPreimage ( [ 1 ; 32 ] ) ;
889
- let invoice = invoice ( payment_preimage) ;
890
899
let payment_id = Some ( invoice_payer. pay_invoice ( & invoice) . unwrap ( ) ) ;
891
900
assert_eq ! ( * payer. attempts. borrow( ) , 1 ) ;
892
901
@@ -995,7 +1004,7 @@ mod tests {
995
1004
let payment_hash = PaymentHash ( invoice. payment_hash ( ) . clone ( ) . into_inner ( ) ) ;
996
1005
let final_value_msat = 100 ;
997
1006
998
- let payer = TestPayer :: new ( ) . expect_value_msat ( final_value_msat) ;
1007
+ let payer = TestPayer :: new ( ) . expect_send ( Amount :: ForInvoice ( final_value_msat) ) ;
999
1008
let router = TestRouter { } ;
1000
1009
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
1001
1010
let logger = TestLogger :: new ( ) ;
@@ -1048,7 +1057,7 @@ mod tests {
1048
1057
1049
1058
let payer = TestPayer :: new ( )
1050
1059
. expect_send ( Amount :: Spontaneous ( final_value_msat) )
1051
- . expect_send ( Amount :: ForInvoiceOrRetry ( final_value_msat) ) ;
1060
+ . expect_send ( Amount :: OnRetry ( final_value_msat) ) ;
1052
1061
let router = TestRouter { } ;
1053
1062
let scorer = RefCell :: new ( TestScorer :: new ( ) ) ;
1054
1063
let logger = TestLogger :: new ( ) ;
@@ -1239,8 +1248,9 @@ mod tests {
1239
1248
1240
1249
#[ derive( Clone , Debug , PartialEq , Eq ) ]
1241
1250
enum Amount {
1242
- ForInvoiceOrRetry ( u64 ) ,
1251
+ ForInvoice ( u64 ) ,
1243
1252
Spontaneous ( u64 ) ,
1253
+ OnRetry ( u64 ) ,
1244
1254
}
1245
1255
1246
1256
impl TestPayer {
@@ -1252,11 +1262,6 @@ mod tests {
1252
1262
}
1253
1263
}
1254
1264
1255
- fn expect_value_msat ( self , value_msat : u64 ) -> Self {
1256
- self . expectations . borrow_mut ( ) . push_back ( Amount :: ForInvoiceOrRetry ( value_msat) ) ;
1257
- self
1258
- }
1259
-
1260
1265
fn expect_send ( self , value_msat : Amount ) -> Self {
1261
1266
self . expectations . borrow_mut ( ) . push_back ( value_msat) ;
1262
1267
self
@@ -1317,7 +1322,7 @@ mod tests {
1317
1322
_payment_secret : & Option < PaymentSecret >
1318
1323
) -> Result < PaymentId , PaymentSendFailure > {
1319
1324
if self . check_attempts ( ) {
1320
- self . check_value_msats ( Amount :: ForInvoiceOrRetry ( route. get_total_amount ( ) ) ) ;
1325
+ self . check_value_msats ( Amount :: ForInvoice ( route. get_total_amount ( ) ) ) ;
1321
1326
Ok ( PaymentId ( [ 1 ; 32 ] ) )
1322
1327
} else {
1323
1328
Err ( PaymentSendFailure :: ParameterError ( APIError :: MonitorUpdateFailed ) )
@@ -1341,7 +1346,7 @@ mod tests {
1341
1346
& self , route : & Route , _payment_id : PaymentId
1342
1347
) -> Result < ( ) , PaymentSendFailure > {
1343
1348
if self . check_attempts ( ) {
1344
- self . check_value_msats ( Amount :: ForInvoiceOrRetry ( route. get_total_amount ( ) ) ) ;
1349
+ self . check_value_msats ( Amount :: OnRetry ( route. get_total_amount ( ) ) ) ;
1345
1350
Ok ( ( ) )
1346
1351
} else {
1347
1352
Err ( PaymentSendFailure :: ParameterError ( APIError :: MonitorUpdateFailed ) )
0 commit comments