X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fchanmon_consistency.rs;h=605a8c29c291690cacff642d78454d00950517ee;hb=d9d4611e65c64001d5ac3b46a1c0288965ee4378;hp=892e4f6622bafae6cfc0bfd4c300f9bc634dd645;hpb=e55e0d53c74ba8c810ad36ea39e0ea1621873c34;p=rust-lightning

diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 892e4f66..605a8c29 100644
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 		ShutdownScript::new_p2wpkh(&pubkey_hash)
 	}
 
-	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> EnforcingSigner {
+	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
+		let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
+		[id; 32]
+	}
+
+	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 		let secp_ctx = Secp256k1::signing_only();
-		let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
+		let id = channel_keys_id[0];
 		let keys = InMemorySigner::new(
 			&secp_ctx,
 			self.get_node_secret(Recipient::Node).unwrap(),
@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 			SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, self.node_id]).unwrap(),
 			SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, self.node_id]).unwrap(),
 			SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, self.node_id]).unwrap(),
-			[id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
+			[id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 			channel_value_satoshis,
-			[0; 32],
+			channel_keys_id,
 		);
 		let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 		EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
@@ -253,7 +258,7 @@ fn check_api_err(api_err: APIError) {
 	match api_err {
 		APIError::APIMisuseError { .. } => panic!("We can't misuse the API"),
 		APIError::FeeRateTooHigh { .. } => panic!("We can't send too much fee?"),
-		APIError::RouteError { .. } => panic!("Our routes should work"),
+		APIError::InvalidRoute { .. } => panic!("Our routes should work"),
 		APIError::ChannelUnavailable { err } => {
 			// Test the error against a list of errors we can hit, and reject
 			// all others. If you hit this panic, the list of acceptable errors
@@ -283,12 +288,13 @@ 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!(),
 	}
 }
 
@@ -842,16 +848,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 				let mut events = nodes[$node].get_and_clear_pending_events();
 				// Sort events so that PendingHTLCsForwardable get processed last. This avoids a
 				// case where we first process a PendingHTLCsForwardable, then claim/fail on a
-				// PaymentReceived, claiming/failing two HTLCs, but leaving a just-generated
-				// PaymentReceived event for the second HTLC in our pending_events (and breaking
+				// PaymentClaimable, claiming/failing two HTLCs, but leaving a just-generated
+				// PaymentClaimable event for the second HTLC in our pending_events (and breaking
 				// our claim_set deduplication).
 				events.sort_by(|a, b| {
-					if let events::Event::PaymentReceived { .. } = a {
+					if let events::Event::PaymentClaimable { .. } = a {
 						if let events::Event::PendingHTLCsForwardable { .. } = b {
 							Ordering::Less
 						} else { Ordering::Equal }
 					} else if let events::Event::PendingHTLCsForwardable { .. } = a {
-						if let events::Event::PaymentReceived { .. } = b {
+						if let events::Event::PaymentClaimable { .. } = b {
 							Ordering::Greater
 						} else { Ordering::Equal }
 					} else { Ordering::Equal }
@@ -859,7 +865,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 				let had_events = !events.is_empty();
 				for event in events.drain(..) {
 					match event {
-						events::Event::PaymentReceived { payment_hash, .. } => {
+						events::Event::PaymentClaimable { payment_hash, .. } => {
 							if claim_set.insert(payment_hash.0) {
 								if $fail {
 									nodes[$node].fail_htlc_backwards(&payment_hash);