@@ -823,3 +823,215 @@ fn feerate_bump<F: Deref, L: Deref>(predicted_weight: usize, input_amounts: u64,
823
823
} ;
824
824
Some ( ( new_fee, new_fee * 1000 / ( predicted_weight as u64 ) ) )
825
825
}
826
+
827
+ #[ cfg( test) ]
828
+ mod tests {
829
+ use chain:: package:: { CounterpartyReceivedHTLCOutput , HolderHTLCOutput , PackageTemplate , PackageSolvingData , RevokedOutput , WEIGHT_REVOKED_OUTPUT } ;
830
+ use chain:: Txid ;
831
+ use ln:: chan_utils:: HTLCOutputInCommitment ;
832
+ use ln:: { PaymentPreimage , PaymentHash } ;
833
+
834
+ use bitcoin:: blockdata:: constants:: WITNESS_SCALE_FACTOR ;
835
+ use bitcoin:: blockdata:: script:: Script ;
836
+ use bitcoin:: blockdata:: transaction:: OutPoint as BitcoinOutPoint ;
837
+
838
+ use bitcoin:: hashes:: hex:: FromHex ;
839
+
840
+ use bitcoin:: secp256k1:: key:: { PublicKey , SecretKey } ;
841
+ use bitcoin:: secp256k1:: Secp256k1 ;
842
+
843
+ macro_rules! dumb_revk_output {
844
+ ( $secp_ctx: expr) => {
845
+ {
846
+ let dumb_scalar = SecretKey :: from_slice( & hex:: decode( "0101010101010101010101010101010101010101010101010101010101010101" ) . unwrap( ) [ ..] ) . unwrap( ) ;
847
+ let dumb_point = PublicKey :: from_secret_key( & $secp_ctx, & dumb_scalar) ;
848
+ PackageSolvingData :: RevokedOutput ( RevokedOutput :: build( dumb_point, dumb_point, dumb_point, dumb_scalar, 0 , 0 ) )
849
+ }
850
+ }
851
+ }
852
+
853
+ macro_rules! dumb_counterparty_output {
854
+ ( $secp_ctx: expr) => {
855
+ {
856
+ let dumb_scalar = SecretKey :: from_slice( & hex:: decode( "0101010101010101010101010101010101010101010101010101010101010101" ) . unwrap( ) [ ..] ) . unwrap( ) ;
857
+ let dumb_point = PublicKey :: from_secret_key( & $secp_ctx, & dumb_scalar) ;
858
+ let hash = PaymentHash ( [ 1 ; 32 ] ) ;
859
+ let htlc = HTLCOutputInCommitment { offered: true , amount_msat: 0 , cltv_expiry: 0 , payment_hash: hash, transaction_output_index: None } ;
860
+ PackageSolvingData :: CounterpartyReceivedHTLCOutput ( CounterpartyReceivedHTLCOutput :: build( dumb_point, dumb_point, dumb_point, htlc) )
861
+ }
862
+ }
863
+ }
864
+
865
+ macro_rules! dumb_htlc_output {
866
+ ( $amt: expr) => {
867
+ {
868
+ let preimage = PaymentPreimage ( [ 2 ; 32 ] ) ;
869
+ PackageSolvingData :: HolderHTLCOutput ( HolderHTLCOutput :: build( Some ( preimage) , $amt) )
870
+ }
871
+ }
872
+ }
873
+
874
+ #[ test]
875
+ #[ should_panic]
876
+ fn test_package_differing_heights ( ) {
877
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
878
+ let secp_ctx = Secp256k1 :: new ( ) ;
879
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
880
+
881
+ let mut package_one_hundred = PackageTemplate :: build_package ( txid, 0 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
882
+ let package_two_hundred = PackageTemplate :: build_package ( txid, 1 , revk_outp. clone ( ) , 1000 , true , 200 ) ;
883
+ package_one_hundred. merge_package ( package_two_hundred) ;
884
+ }
885
+
886
+ #[ test]
887
+ #[ should_panic]
888
+ fn test_package_untractable_merge_to ( ) {
889
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
890
+ let secp_ctx = Secp256k1 :: new ( ) ;
891
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
892
+ let htlc_outp = dumb_htlc_output ! ( 0 ) ;
893
+
894
+ let mut untractable_package = PackageTemplate :: build_package ( txid, 0 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
895
+ let malleable_package = PackageTemplate :: build_package ( txid, 1 , htlc_outp. clone ( ) , 1000 , true , 100 ) ;
896
+ untractable_package. merge_package ( malleable_package) ;
897
+ }
898
+
899
+ #[ test]
900
+ #[ should_panic]
901
+ fn test_package_untractable_merge_from ( ) {
902
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
903
+ let secp_ctx = Secp256k1 :: new ( ) ;
904
+ let htlc_outp = dumb_htlc_output ! ( 0 ) ;
905
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
906
+
907
+ let mut malleable_package = PackageTemplate :: build_package ( txid, 0 , htlc_outp. clone ( ) , 1000 , true , 100 ) ;
908
+ let untractable_package = PackageTemplate :: build_package ( txid, 1 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
909
+ malleable_package. merge_package ( untractable_package) ;
910
+ }
911
+
912
+ #[ test]
913
+ #[ should_panic]
914
+ fn test_package_noaggregation_to ( ) {
915
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
916
+ let secp_ctx = Secp256k1 :: new ( ) ;
917
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
918
+
919
+ let mut noaggregation_package = PackageTemplate :: build_package ( txid, 0 , revk_outp. clone ( ) , 1000 , false , 100 ) ;
920
+ let aggregation_package = PackageTemplate :: build_package ( txid, 1 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
921
+ noaggregation_package. merge_package ( aggregation_package) ;
922
+ }
923
+
924
+ #[ test]
925
+ #[ should_panic]
926
+ fn test_package_noaggregation_from ( ) {
927
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
928
+ let secp_ctx = Secp256k1 :: new ( ) ;
929
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
930
+
931
+ let mut aggregation_package = PackageTemplate :: build_package ( txid, 0 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
932
+ let noaggregation_package = PackageTemplate :: build_package ( txid, 1 , revk_outp. clone ( ) , 1000 , false , 100 ) ;
933
+ aggregation_package. merge_package ( noaggregation_package) ;
934
+ }
935
+
936
+ #[ test]
937
+ #[ should_panic]
938
+ fn test_package_empty ( ) {
939
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
940
+ let secp_ctx = Secp256k1 :: new ( ) ;
941
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
942
+
943
+ let mut empty_package = PackageTemplate :: build_package ( txid, 0 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
944
+ empty_package. inputs = vec ! [ ] ;
945
+ let package = PackageTemplate :: build_package ( txid, 1 , revk_outp. clone ( ) , 1000 , true , 100 ) ;
946
+ empty_package. merge_package ( package) ;
947
+ }
948
+
949
+ #[ test]
950
+ #[ should_panic]
951
+ fn test_package_differing_categories ( ) {
952
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
953
+ let secp_ctx = Secp256k1 :: new ( ) ;
954
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
955
+ let counterparty_outp = dumb_counterparty_output ! ( secp_ctx) ;
956
+
957
+ let mut revoked_package = PackageTemplate :: build_package ( txid, 0 , revk_outp, 1000 , true , 100 ) ;
958
+ let counterparty_package = PackageTemplate :: build_package ( txid, 1 , counterparty_outp, 1000 , true , 100 ) ;
959
+ revoked_package. merge_package ( counterparty_package) ;
960
+ }
961
+
962
+ #[ test]
963
+ fn test_package_split_malleable ( ) {
964
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
965
+ let secp_ctx = Secp256k1 :: new ( ) ;
966
+ let revk_outp_one = dumb_revk_output ! ( secp_ctx) ;
967
+ let revk_outp_two = dumb_revk_output ! ( secp_ctx) ;
968
+ let revk_outp_three = dumb_revk_output ! ( secp_ctx) ;
969
+
970
+ let mut package_one = PackageTemplate :: build_package ( txid, 0 , revk_outp_one, 1000 , true , 100 ) ;
971
+ let package_two = PackageTemplate :: build_package ( txid, 1 , revk_outp_two, 1000 , true , 100 ) ;
972
+ let package_three = PackageTemplate :: build_package ( txid, 2 , revk_outp_three, 1000 , true , 100 ) ;
973
+
974
+ package_one. merge_package ( package_two) ;
975
+ package_one. merge_package ( package_three) ;
976
+ assert_eq ! ( package_one. outpoints( ) . len( ) , 3 ) ;
977
+
978
+ if let Some ( split_package) = package_one. split_package ( & BitcoinOutPoint { txid, vout : 1 } ) {
979
+ // Packages attributes should be identical
980
+ assert ! ( split_package. is_malleable( ) ) ;
981
+ assert_eq ! ( split_package. absolute_timelock, package_one. absolute_timelock) ;
982
+ assert_eq ! ( split_package. aggregable, package_one. aggregable) ;
983
+ assert_eq ! ( split_package. feerate_previous, package_one. feerate_previous) ;
984
+ assert_eq ! ( split_package. height_timer, package_one. height_timer) ;
985
+ assert_eq ! ( split_package. height_original, package_one. height_original) ;
986
+ } else { panic ! ( ) ; }
987
+ assert_eq ! ( package_one. outpoints( ) . len( ) , 2 ) ;
988
+ }
989
+
990
+ #[ test]
991
+ fn test_package_split_untractable ( ) {
992
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
993
+ let htlc_outp_one = dumb_htlc_output ! ( 0 ) ;
994
+
995
+ let mut package_one = PackageTemplate :: build_package ( txid, 0 , htlc_outp_one, 1000 , true , 100 ) ;
996
+ let ret_split = package_one. split_package ( & BitcoinOutPoint { txid, vout : 0 } ) ;
997
+ assert ! ( ret_split. is_none( ) ) ;
998
+ }
999
+
1000
+ #[ test]
1001
+ fn test_package_timer ( ) {
1002
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
1003
+ let secp_ctx = Secp256k1 :: new ( ) ;
1004
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
1005
+
1006
+ let mut package = PackageTemplate :: build_package ( txid, 0 , revk_outp, 1000 , true , 100 ) ;
1007
+ let timer_none = package. timer ( ) ;
1008
+ assert ! ( timer_none. is_none( ) ) ;
1009
+ package. set_timer ( Some ( 100 ) ) ;
1010
+ if let Some ( timer_some) = package. timer ( ) {
1011
+ assert_eq ! ( timer_some, 100 ) ;
1012
+ } else { panic ! ( ) }
1013
+ }
1014
+
1015
+ #[ test]
1016
+ fn test_package_amounts ( ) {
1017
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
1018
+ let htlc_outp = dumb_htlc_output ! ( 1000 ) ;
1019
+
1020
+ let package = PackageTemplate :: build_package ( txid, 0 , htlc_outp, 1000 , true , 100 ) ;
1021
+ assert_eq ! ( package. package_amount( ) , 1000 ) ;
1022
+ }
1023
+
1024
+ #[ test]
1025
+ fn test_package_weight ( ) {
1026
+ let txid = Txid :: from_hex ( "c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e" ) . unwrap ( ) ;
1027
+ let secp_ctx = Secp256k1 :: new ( ) ;
1028
+ let revk_outp = dumb_revk_output ! ( secp_ctx) ;
1029
+
1030
+ let package = PackageTemplate :: build_package ( txid, 0 , revk_outp, 0 , true , 100 ) ;
1031
+ // (nVersion (4) + nLocktime (4) + count_tx_in (1) + prevout (36) + sequence (4) + script_length (1) + count_tx_out (1) + value (8) + var_int (1)) * WITNESS_SCALE_FACTOR
1032
+ // + witness marker (2) + WEIGHT_REVOKED_OUTPUT
1033
+ assert_eq ! ( package. package_weight( & Script :: new( ) ) , ( 4 + 4 + 1 + 36 + 4 + 1 + 1 + 8 + 1 ) * WITNESS_SCALE_FACTOR + 2 + WEIGHT_REVOKED_OUTPUT as usize ) ;
1034
+ }
1035
+
1036
+ //TODO: finalize_package ?
1037
+ }
0 commit comments