From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Sun, 27 Aug 2023 05:18:00 +0000 (+0000)
Subject: Merge pull request #2485 from optout21/channel-id-4struct1
X-Git-Tag: v0.0.117-alpha1~37
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=61d896d5193bad813ce53cc823e9f2afa17e09a8;p=rust-lightning

Merge pull request #2485 from optout21/channel-id-4struct1

Introduce new ChannelId struct
---

61d896d5193bad813ce53cc823e9f2afa17e09a8
diff --cc lightning/src/routing/router.rs
index db19738a5,f9d8b014b..79d54e22d
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@@ -6845,8 -6881,8 +6846,9 @@@ pub(crate) mod bench_utils 
  	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
  
  	use crate::chain::transaction::OutPoint;
 +	use crate::routing::scoring::ScoreUpdate;
  	use crate::sign::{EntropySource, KeysManager};
+ 	use crate::ln::ChannelId;
  	use crate::ln::channelmanager::{self, ChannelCounterparty, ChannelDetails};
  	use crate::ln::features::Bolt11InvoiceFeatures;
  	use crate::routing::gossip::NetworkGraph;