Skip to content

Commit c45601f

Browse files
SWvheerdenSWvheerden
committed
Added new fields to unit tests
1 parent bf7f98e commit c45601f

File tree

2 files changed

+37
-5
lines changed

2 files changed

+37
-5
lines changed

‎src/ln/router.rs

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ struct DirectionalChannelInfo {
5656
htlc_minimum_msat: u64,
5757
fee_base_msat: u32,
5858
fee_proportional_millionths: u32,
59-
bitcoin_key: PublicKey,
60-
}
59+
}
6160

6261
impl std::fmt::Display for DirectionalChannelInfo {
6362
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
@@ -287,7 +286,6 @@ impl RoutingMessageHandler for Router {
287286
htlc_minimum_msat: u64::max_value(),
288287
fee_base_msat: u32::max_value(),
289288
fee_proportional_millionths: u32::max_value(),
290-
bitcoin_key : msg.contents.bitcoin_key_1.clone(),
291289
},
292290
two_to_one: DirectionalChannelInfo {
293291
src_node_id: msg.contents.node_id_2.clone(),
@@ -297,7 +295,6 @@ impl RoutingMessageHandler for Router {
297295
htlc_minimum_msat: u64::max_value(),
298296
fee_base_msat: u32::max_value(),
299297
fee_proportional_millionths: u32::max_value(),
300-
bitcoin_key : msg.contents.bitcoin_key_2.clone(),
301298
},
302299
announcement_message : Some(msg.clone()),
303300
last_update_message : None,
@@ -871,6 +868,7 @@ mod tests {
871868
rgb: [0; 3],
872869
alias: [0; 32],
873870
addresses: Vec::new(),
871+
announcement_message : None,
874872
});
875873
network.channels.insert(NetworkMap::get_key(1, zero_hash.clone()), ChannelInfo {
876874
features: GlobalFeatures::new(),
@@ -891,6 +889,8 @@ mod tests {
891889
fee_base_msat: 0,
892890
fee_proportional_millionths: 0,
893891
},
892+
announcement_message : None,
893+
last_update_message : None,
894894
});
895895
network.nodes.insert(node2.clone(), NodeInfo {
896896
channels: vec!(NetworkMap::get_key(2, zero_hash.clone()), NetworkMap::get_key(4, zero_hash.clone())),
@@ -901,6 +901,7 @@ mod tests {
901901
rgb: [0; 3],
902902
alias: [0; 32],
903903
addresses: Vec::new(),
904+
announcement_message : None,
904905
});
905906
network.channels.insert(NetworkMap::get_key(2, zero_hash.clone()), ChannelInfo {
906907
features: GlobalFeatures::new(),
@@ -921,6 +922,8 @@ mod tests {
921922
fee_base_msat: 0,
922923
fee_proportional_millionths: 0,
923924
},
925+
announcement_message : None,
926+
last_update_message : None,
924927
});
925928
network.nodes.insert(node8.clone(), NodeInfo {
926929
channels: vec!(NetworkMap::get_key(12, zero_hash.clone()), NetworkMap::get_key(13, zero_hash.clone())),
@@ -931,6 +934,7 @@ mod tests {
931934
rgb: [0; 3],
932935
alias: [0; 32],
933936
addresses: Vec::new(),
937+
announcement_message : None,
934938
});
935939
network.channels.insert(NetworkMap::get_key(12, zero_hash.clone()), ChannelInfo {
936940
features: GlobalFeatures::new(),
@@ -951,6 +955,8 @@ mod tests {
951955
fee_base_msat: 0,
952956
fee_proportional_millionths: 0,
953957
},
958+
announcement_message : None,
959+
last_update_message : None,
954960
});
955961
network.nodes.insert(node3.clone(), NodeInfo {
956962
channels: vec!(
@@ -967,6 +973,7 @@ mod tests {
967973
rgb: [0; 3],
968974
alias: [0; 32],
969975
addresses: Vec::new(),
976+
announcement_message : None,
970977
});
971978
network.channels.insert(NetworkMap::get_key(3, zero_hash.clone()), ChannelInfo {
972979
features: GlobalFeatures::new(),
@@ -987,6 +994,8 @@ mod tests {
987994
fee_base_msat: 100,
988995
fee_proportional_millionths: 0,
989996
},
997+
announcement_message : None,
998+
last_update_message : None,
990999
});
9911000
network.channels.insert(NetworkMap::get_key(4, zero_hash.clone()), ChannelInfo {
9921001
features: GlobalFeatures::new(),
@@ -1007,6 +1016,8 @@ mod tests {
10071016
fee_base_msat: 0,
10081017
fee_proportional_millionths: 0,
10091018
},
1019+
announcement_message : None,
1020+
last_update_message : None,
10101021
});
10111022
network.channels.insert(NetworkMap::get_key(13, zero_hash.clone()), ChannelInfo {
10121023
features: GlobalFeatures::new(),
@@ -1027,6 +1038,8 @@ mod tests {
10271038
fee_base_msat: 0,
10281039
fee_proportional_millionths: 0,
10291040
},
1041+
announcement_message : None,
1042+
last_update_message : None,
10301043
});
10311044
network.nodes.insert(node4.clone(), NodeInfo {
10321045
channels: vec!(NetworkMap::get_key(5, zero_hash.clone()), NetworkMap::get_key(11, zero_hash.clone())),
@@ -1037,6 +1050,7 @@ mod tests {
10371050
rgb: [0; 3],
10381051
alias: [0; 32],
10391052
addresses: Vec::new(),
1053+
announcement_message : None,
10401054
});
10411055
network.channels.insert(NetworkMap::get_key(5, zero_hash.clone()), ChannelInfo {
10421056
features: GlobalFeatures::new(),
@@ -1057,6 +1071,8 @@ mod tests {
10571071
fee_base_msat: 0,
10581072
fee_proportional_millionths: 0,
10591073
},
1074+
announcement_message : None,
1075+
last_update_message : None,
10601076
});
10611077
network.nodes.insert(node5.clone(), NodeInfo {
10621078
channels: vec!(NetworkMap::get_key(6, zero_hash.clone()), NetworkMap::get_key(11, zero_hash.clone())),
@@ -1067,6 +1083,7 @@ mod tests {
10671083
rgb: [0; 3],
10681084
alias: [0; 32],
10691085
addresses: Vec::new(),
1086+
announcement_message : None,
10701087
});
10711088
network.channels.insert(NetworkMap::get_key(6, zero_hash.clone()), ChannelInfo {
10721089
features: GlobalFeatures::new(),
@@ -1087,6 +1104,8 @@ mod tests {
10871104
fee_base_msat: 0,
10881105
fee_proportional_millionths: 0,
10891106
},
1107+
announcement_message : None,
1108+
last_update_message : None,
10901109
});
10911110
network.channels.insert(NetworkMap::get_key(11, zero_hash.clone()), ChannelInfo {
10921111
features: GlobalFeatures::new(),
@@ -1107,6 +1126,8 @@ mod tests {
11071126
fee_base_msat: 0,
11081127
fee_proportional_millionths: 0,
11091128
},
1129+
announcement_message : None,
1130+
last_update_message : None,
11101131
});
11111132
network.nodes.insert(node6.clone(), NodeInfo {
11121133
channels: vec!(NetworkMap::get_key(7, zero_hash.clone())),
@@ -1117,6 +1138,7 @@ mod tests {
11171138
rgb: [0; 3],
11181139
alias: [0; 32],
11191140
addresses: Vec::new(),
1141+
announcement_message : None,
11201142
});
11211143
network.channels.insert(NetworkMap::get_key(7, zero_hash.clone()), ChannelInfo {
11221144
features: GlobalFeatures::new(),
@@ -1137,6 +1159,8 @@ mod tests {
11371159
fee_base_msat: 0,
11381160
fee_proportional_millionths: 0,
11391161
},
1162+
announcement_message : None,
1163+
last_update_message : None,
11401164
});
11411165
}
11421166

‎src/util/test_utils.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl TestRoutingMessageHandler {
154154
TestRoutingMessageHandler {}
155155
}
156156
}
157-
157+
use std;
158158
impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
159159
fn handle_node_announcement(&self, _msg: &msgs::NodeAnnouncement) -> Result<bool, HandleError> {
160160
Err(HandleError { err: "", action: None })
@@ -166,6 +166,14 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
166166
Err(HandleError { err: "", action: None })
167167
}
168168
fn handle_htlc_fail_channel_update(&self, _update: &msgs::HTLCFailChannelUpdate) {}
169+
fn get_all_channel_announcements(&self)-> Result<Vec<(msgs::ChannelAnnouncement,msgs::ChannelUpdate)>, std::fmt::Error>
170+
{
171+
return Ok(Vec::new());
172+
}
173+
fn get_all_node_announcements(&self)-> Result<Vec<(msgs::NodeAnnouncement)>, std::fmt::Error>
174+
{
175+
return Ok(Vec::new());
176+
}
169177
}
170178

171179
pub struct TestLogger {

0 commit comments

Comments
 (0)