@@ -56,8 +56,7 @@ struct DirectionalChannelInfo {
56
56
htlc_minimum_msat : u64 ,
57
57
fee_base_msat : u32 ,
58
58
fee_proportional_millionths : u32 ,
59
- bitcoin_key : PublicKey ,
60
- }
59
+ }
61
60
62
61
impl std:: fmt:: Display for DirectionalChannelInfo {
63
62
fn fmt ( & self , f : & mut std:: fmt:: Formatter ) -> Result < ( ) , std:: fmt:: Error > {
@@ -287,7 +286,6 @@ impl RoutingMessageHandler for Router {
287
286
htlc_minimum_msat : u64:: max_value ( ) ,
288
287
fee_base_msat : u32:: max_value ( ) ,
289
288
fee_proportional_millionths : u32:: max_value ( ) ,
290
- bitcoin_key : msg. contents . bitcoin_key_1 . clone ( ) ,
291
289
} ,
292
290
two_to_one : DirectionalChannelInfo {
293
291
src_node_id : msg. contents . node_id_2 . clone ( ) ,
@@ -297,7 +295,6 @@ impl RoutingMessageHandler for Router {
297
295
htlc_minimum_msat : u64:: max_value ( ) ,
298
296
fee_base_msat : u32:: max_value ( ) ,
299
297
fee_proportional_millionths : u32:: max_value ( ) ,
300
- bitcoin_key : msg. contents . bitcoin_key_2 . clone ( ) ,
301
298
} ,
302
299
announcement_message : Some ( msg. clone ( ) ) ,
303
300
last_update_message : None ,
@@ -871,6 +868,7 @@ mod tests {
871
868
rgb : [ 0 ; 3 ] ,
872
869
alias : [ 0 ; 32 ] ,
873
870
addresses : Vec :: new ( ) ,
871
+ announcement_message : None ,
874
872
} ) ;
875
873
network. channels . insert ( NetworkMap :: get_key ( 1 , zero_hash. clone ( ) ) , ChannelInfo {
876
874
features : GlobalFeatures :: new ( ) ,
@@ -891,6 +889,8 @@ mod tests {
891
889
fee_base_msat : 0 ,
892
890
fee_proportional_millionths : 0 ,
893
891
} ,
892
+ announcement_message : None ,
893
+ last_update_message : None ,
894
894
} ) ;
895
895
network. nodes . insert ( node2. clone ( ) , NodeInfo {
896
896
channels : vec ! ( NetworkMap :: get_key( 2 , zero_hash. clone( ) ) , NetworkMap :: get_key( 4 , zero_hash. clone( ) ) ) ,
@@ -901,6 +901,7 @@ mod tests {
901
901
rgb : [ 0 ; 3 ] ,
902
902
alias : [ 0 ; 32 ] ,
903
903
addresses : Vec :: new ( ) ,
904
+ announcement_message : None ,
904
905
} ) ;
905
906
network. channels . insert ( NetworkMap :: get_key ( 2 , zero_hash. clone ( ) ) , ChannelInfo {
906
907
features : GlobalFeatures :: new ( ) ,
@@ -921,6 +922,8 @@ mod tests {
921
922
fee_base_msat : 0 ,
922
923
fee_proportional_millionths : 0 ,
923
924
} ,
925
+ announcement_message : None ,
926
+ last_update_message : None ,
924
927
} ) ;
925
928
network. nodes . insert ( node8. clone ( ) , NodeInfo {
926
929
channels : vec ! ( NetworkMap :: get_key( 12 , zero_hash. clone( ) ) , NetworkMap :: get_key( 13 , zero_hash. clone( ) ) ) ,
@@ -931,6 +934,7 @@ mod tests {
931
934
rgb : [ 0 ; 3 ] ,
932
935
alias : [ 0 ; 32 ] ,
933
936
addresses : Vec :: new ( ) ,
937
+ announcement_message : None ,
934
938
} ) ;
935
939
network. channels . insert ( NetworkMap :: get_key ( 12 , zero_hash. clone ( ) ) , ChannelInfo {
936
940
features : GlobalFeatures :: new ( ) ,
@@ -951,6 +955,8 @@ mod tests {
951
955
fee_base_msat : 0 ,
952
956
fee_proportional_millionths : 0 ,
953
957
} ,
958
+ announcement_message : None ,
959
+ last_update_message : None ,
954
960
} ) ;
955
961
network. nodes . insert ( node3. clone ( ) , NodeInfo {
956
962
channels : vec ! (
@@ -967,6 +973,7 @@ mod tests {
967
973
rgb : [ 0 ; 3 ] ,
968
974
alias : [ 0 ; 32 ] ,
969
975
addresses : Vec :: new ( ) ,
976
+ announcement_message : None ,
970
977
} ) ;
971
978
network. channels . insert ( NetworkMap :: get_key ( 3 , zero_hash. clone ( ) ) , ChannelInfo {
972
979
features : GlobalFeatures :: new ( ) ,
@@ -987,6 +994,8 @@ mod tests {
987
994
fee_base_msat : 100 ,
988
995
fee_proportional_millionths : 0 ,
989
996
} ,
997
+ announcement_message : None ,
998
+ last_update_message : None ,
990
999
} ) ;
991
1000
network. channels . insert ( NetworkMap :: get_key ( 4 , zero_hash. clone ( ) ) , ChannelInfo {
992
1001
features : GlobalFeatures :: new ( ) ,
@@ -1007,6 +1016,8 @@ mod tests {
1007
1016
fee_base_msat : 0 ,
1008
1017
fee_proportional_millionths : 0 ,
1009
1018
} ,
1019
+ announcement_message : None ,
1020
+ last_update_message : None ,
1010
1021
} ) ;
1011
1022
network. channels . insert ( NetworkMap :: get_key ( 13 , zero_hash. clone ( ) ) , ChannelInfo {
1012
1023
features : GlobalFeatures :: new ( ) ,
@@ -1027,6 +1038,8 @@ mod tests {
1027
1038
fee_base_msat : 0 ,
1028
1039
fee_proportional_millionths : 0 ,
1029
1040
} ,
1041
+ announcement_message : None ,
1042
+ last_update_message : None ,
1030
1043
} ) ;
1031
1044
network. nodes . insert ( node4. clone ( ) , NodeInfo {
1032
1045
channels : vec ! ( NetworkMap :: get_key( 5 , zero_hash. clone( ) ) , NetworkMap :: get_key( 11 , zero_hash. clone( ) ) ) ,
@@ -1037,6 +1050,7 @@ mod tests {
1037
1050
rgb : [ 0 ; 3 ] ,
1038
1051
alias : [ 0 ; 32 ] ,
1039
1052
addresses : Vec :: new ( ) ,
1053
+ announcement_message : None ,
1040
1054
} ) ;
1041
1055
network. channels . insert ( NetworkMap :: get_key ( 5 , zero_hash. clone ( ) ) , ChannelInfo {
1042
1056
features : GlobalFeatures :: new ( ) ,
@@ -1057,6 +1071,8 @@ mod tests {
1057
1071
fee_base_msat : 0 ,
1058
1072
fee_proportional_millionths : 0 ,
1059
1073
} ,
1074
+ announcement_message : None ,
1075
+ last_update_message : None ,
1060
1076
} ) ;
1061
1077
network. nodes . insert ( node5. clone ( ) , NodeInfo {
1062
1078
channels : vec ! ( NetworkMap :: get_key( 6 , zero_hash. clone( ) ) , NetworkMap :: get_key( 11 , zero_hash. clone( ) ) ) ,
@@ -1067,6 +1083,7 @@ mod tests {
1067
1083
rgb : [ 0 ; 3 ] ,
1068
1084
alias : [ 0 ; 32 ] ,
1069
1085
addresses : Vec :: new ( ) ,
1086
+ announcement_message : None ,
1070
1087
} ) ;
1071
1088
network. channels . insert ( NetworkMap :: get_key ( 6 , zero_hash. clone ( ) ) , ChannelInfo {
1072
1089
features : GlobalFeatures :: new ( ) ,
@@ -1087,6 +1104,8 @@ mod tests {
1087
1104
fee_base_msat : 0 ,
1088
1105
fee_proportional_millionths : 0 ,
1089
1106
} ,
1107
+ announcement_message : None ,
1108
+ last_update_message : None ,
1090
1109
} ) ;
1091
1110
network. channels . insert ( NetworkMap :: get_key ( 11 , zero_hash. clone ( ) ) , ChannelInfo {
1092
1111
features : GlobalFeatures :: new ( ) ,
@@ -1107,6 +1126,8 @@ mod tests {
1107
1126
fee_base_msat : 0 ,
1108
1127
fee_proportional_millionths : 0 ,
1109
1128
} ,
1129
+ announcement_message : None ,
1130
+ last_update_message : None ,
1110
1131
} ) ;
1111
1132
network. nodes . insert ( node6. clone ( ) , NodeInfo {
1112
1133
channels : vec ! ( NetworkMap :: get_key( 7 , zero_hash. clone( ) ) ) ,
@@ -1117,6 +1138,7 @@ mod tests {
1117
1138
rgb : [ 0 ; 3 ] ,
1118
1139
alias : [ 0 ; 32 ] ,
1119
1140
addresses : Vec :: new ( ) ,
1141
+ announcement_message : None ,
1120
1142
} ) ;
1121
1143
network. channels . insert ( NetworkMap :: get_key ( 7 , zero_hash. clone ( ) ) , ChannelInfo {
1122
1144
features : GlobalFeatures :: new ( ) ,
@@ -1137,6 +1159,8 @@ mod tests {
1137
1159
fee_base_msat : 0 ,
1138
1160
fee_proportional_millionths : 0 ,
1139
1161
} ,
1162
+ announcement_message : None ,
1163
+ last_update_message : None ,
1140
1164
} ) ;
1141
1165
}
1142
1166
0 commit comments