Merge pull request #2694 from Evanfeenstra/public-scid-utils

public scid utils

diff --cc lightning/src/util/mod.rs
index f2116032786ce9c6bbed6de0c4e1d82883874ba0,9affed555c51c06f7d921461d02e9eb6e1369940..6ce00acab451e1aa00b3a541c7392e22be63ca50
--- 1/lightning/src/util/mod.rs
--- 2/lightning/src/util/mod.rs
+++ b/lightning/src/util/mod.rs
@@@ -29,8 -30,11 +30,7 @@@ pub(crate) mod base32
  
  pub(crate) mod atomic_counter;
  pub(crate) mod byte_utils;
 -pub(crate) mod chacha20;
 -#[cfg(not(fuzzing))]
 -pub(crate) mod poly1305;
 -pub(crate) mod chacha20poly1305rfc;
  pub(crate) mod transaction_utils;
- pub(crate) mod scid_utils;
  pub(crate) mod time;
  
  pub mod indexed_map;

diff --cc lightning/src/util/scid_utils.rs
Simple merge