Merge pull request #1852 from TheBlueMatt/2022-11-accept-bad-but-better-fee-updates

[rust-lightning] / fuzz / src / chanmon_consistency.rs

diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 4f966d3e7b6decf23fd3481aaeedf80143b25a86..783bbc06aa9fe58e4de90e5ce13650aeb0458b9d 100644 (file)
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -283,16 +283,17 @@ fn check_payment_err(send_err: PaymentSendFailure) {
                PaymentSendFailure::PathParameterError(per_path_results) => {
                        for res in per_path_results { if let Err(api_err) = res { check_api_err(api_err); } }
                },
-               PaymentSendFailure::AllFailedRetrySafe(per_path_results) => {
+               PaymentSendFailure::AllFailedResendSafe(per_path_results) => {
                        for api_err in per_path_results { check_api_err(api_err); }
                },
                PaymentSendFailure::PartialFailure { results, .. } => {
                        for res in results { if let Err(api_err) = res { check_api_err(api_err); } }
                },
+               PaymentSendFailure::DuplicatePayment => panic!(),
        }
 }
 
-type ChanMan = ChannelManager<EnforcingSigner, Arc<TestChainMonitor>, Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<dyn Logger>>;
+type ChanMan = ChannelManager<Arc<TestChainMonitor>, Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<dyn Logger>>;
 
 #[inline]
 fn get_payment_secret_hash(dest: &ChanMan, payment_id: &mut u8) -> Option<(PaymentSecret, PaymentHash)> {
@@ -879,6 +880,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
                                                        // looking like probes.
                                                },
                                                events::Event::PaymentForwarded { .. } if $node == 1 => {},
+                                               events::Event::ChannelReady { .. } => {},
                                                events::Event::PendingHTLCsForwardable { .. } => {
                                                        nodes[$node].process_pending_htlc_forwards();
                                                },