X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Ffull_stack.rs;h=d07def30ff987176305faa2a76367b6b073b5fa0;hb=baa727ea3867a823ff6fb51abae1d7da534628cb;hp=89212e5837073342a4a7f569411b07badc5fe247;hpb=a854ccb9b5dfa762ae22e2e547630eb3f8e4235b;p=rust-lightning

diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs
index 89212e583..d07def30f 100644
--- a/fuzz/src/full_stack.rs
+++ b/fuzz/src/full_stack.rs
@@ -737,10 +737,10 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 			},
 			// 15, 16, 17, 18 is above
 			19 => {
-				let mut list = loss_detector.handler.get_peer_node_ids();
-				list.sort_by_key(|v| v.0);
-				if let Some((id, _)) = list.get(0) {
-					loss_detector.handler.disconnect_by_node_id(*id);
+				let mut list = loss_detector.handler.list_peers();
+				list.sort_by_key(|v| v.counterparty_node_id);
+				if let Some(peer_details) = list.get(0) {
+					loss_detector.handler.disconnect_by_node_id(peer_details.counterparty_node_id);
 				}
 			},
 			20 => loss_detector.handler.disconnect_all_peers(),
@@ -971,6 +971,8 @@ mod tests {
 
 		// create the funding transaction (client should send funding_created now)
 		ext_from_hex("0a", &mut test);
+		// Two feerate requests to check the dust exposure on the initial commitment tx
+		ext_from_hex("00fd00fd", &mut test);
 
 		// inbound read from peer id 1 of len 18
 		ext_from_hex("030112", &mut test);
@@ -1019,6 +1021,9 @@ mod tests {
 		// end of update_add_htlc from 0 to 1 via client and mac
 		ext_from_hex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ab00000000000000000000000000000000000000000000000000000000000000 03000000000000000000000000000000", &mut test);
 
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
+
 		// inbound read from peer id 0 of len 18
 		ext_from_hex("030012", &mut test);
 		// message header indicating message length 100
@@ -1040,6 +1045,8 @@ mod tests {
 
 		// process the now-pending HTLC forward
 		ext_from_hex("07", &mut test);
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
 		// client now sends id 1 update_add_htlc and commitment_signed (CHECK 7: UpdateHTLCs event for node 03020000 with 1 HTLCs for channel 3f000000)
 
 		// we respond with commitment_signed then revoke_and_ack (a weird, but valid, order)
@@ -1115,6 +1122,9 @@ mod tests {
 		// end of update_add_htlc from 0 to 1 via client and mac
 		ext_from_hex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ab00000000000000000000000000000000000000000000000000000000000000 03000000000000000000000000000000", &mut test);
 
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
+
 		// now respond to the update_fulfill_htlc+commitment_signed messages the client sent to peer 0
 		// inbound read from peer id 0 of len 18
 		ext_from_hex("030012", &mut test);
@@ -1146,6 +1156,10 @@ mod tests {
 
 		// process the now-pending HTLC forward
 		ext_from_hex("07", &mut test);
+
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
+
 		// client now sends id 1 update_add_htlc and commitment_signed (CHECK 7 duplicate)
 		// we respond with revoke_and_ack, then commitment_signed, then update_fail_htlc
 
@@ -1243,6 +1257,9 @@ mod tests {
 		// end of update_add_htlc from 0 to 1 via client and mac
 		ext_from_hex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 5300000000000000000000000000000000000000000000000000000000000000 03000000000000000000000000000000", &mut test);
 
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
+
 		// inbound read from peer id 0 of len 18
 		ext_from_hex("030012", &mut test);
 		// message header indicating message length 164
@@ -1264,6 +1281,8 @@ mod tests {
 
 		// process the now-pending HTLC forward
 		ext_from_hex("07", &mut test);
+		// Two feerate requests to check dust exposure
+		ext_from_hex("00fd00fd", &mut test);
 		// client now sends id 1 update_add_htlc and commitment_signed (CHECK 7 duplicate)
 
 		// connect a block with one transaction of len 125