Merge pull request #1542 from ViktorTigerstrom/2022-06-prepare-maps-for-channels...

Preparations for storing channels per peer

diff --cc lightning/src/ln/channel.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
index 7db5e3860bf29f5b0f981132fdfd7e69873d3c47,cc27834f1eaf6c6b614310338f7f9cd8268e3404..3e364829ef90ac8dae4832118a1a376aa51f0897
--- 1/lightning/src/ln/channelmanager.rs
--- 2/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@@ -7211,10 -7185,9 +7254,11 @@@ impl<'a, Signer: Sign, M: Deref, T: Der
                        pending_outbound_payments: Mutex::new(pending_outbound_payments.unwrap()),
  
                        outbound_scid_aliases: Mutex::new(outbound_scid_aliases),
+                       id_to_peer: Mutex::new(id_to_peer),
                        fake_scid_rand_bytes: fake_scid_rand_bytes.unwrap(),
  
 +                      probing_cookie_secret: probing_cookie_secret.unwrap(),
 +
                        our_network_key,
                        our_network_pubkey,
                        secp_ctx,