Use alloc for no_std builds

GeneFerneau · GeneFerneau · commit fb308a16b45b · 2021-05-26T18:34:44.000Z
Replace std structs with alloc equivalents to support no_std builds
diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
@@ -37,6 +37,7 @@ use util::logger::Logger;
 use util::events;
 use util::events::Event;
 
+use alloc::vec::Vec;
 use std::collections::{HashMap, hash_map};
 use std::sync::RwLock;
 use std::ops::Deref;
diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
@@ -51,6 +51,7 @@ use util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, U48};
 use util::byte_utils;
 use util::events::Event;
 
+use alloc::{vec, vec::Vec};
 use std::collections::{HashMap, HashSet};
 use std::{cmp, mem};
 use std::io::Error;
@@ -3060,6 +3061,7 @@ mod tests {
 	use bitcoin::secp256k1::Secp256k1;
 	use std::sync::{Arc, Mutex};
 	use chain::keysinterface::InMemorySigner;
+	use alloc::{vec, vec::Vec};
 
 	#[test]
 	fn test_prune_preimages() {
diff --git a/lightning/src/chain/keysinterface.rs b/lightning/src/chain/keysinterface.rs
@@ -37,6 +37,7 @@ use ln::chan_utils;
 use ln::chan_utils::{HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, HolderCommitmentTransaction, ChannelTransactionParameters, CommitmentTransaction};
 use ln::msgs::UnsignedChannelAnnouncement;
 
+use alloc::vec::Vec;
 use std::collections::HashSet;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::io::Error;
diff --git a/lightning/src/chain/mod.rs b/lightning/src/chain/mod.rs
@@ -18,6 +18,8 @@ use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitor
 use chain::keysinterface::Sign;
 use chain::transaction::{OutPoint, TransactionData};
 
+use alloc::vec::Vec;
+
 pub mod chaininterface;
 pub mod chainmonitor;
 pub mod channelmonitor;
diff --git a/lightning/src/lib.rs b/lightning/src/lib.rs
@@ -31,6 +31,7 @@
 #![cfg_attr(all(any(test, feature = "_test_utils"), feature = "unstable"), feature(test))]
 #[cfg(all(any(test, feature = "_test_utils"), feature = "unstable"))] extern crate test;
 
+extern crate alloc;
 extern crate bitcoin;
 #[cfg(any(test, feature = "_test_utils"))] extern crate hex;
 #[cfg(any(test, feature = "fuzztarget", feature = "_test_utils"))] extern crate regex;
diff --git a/lightning/src/ln/chan_utils.rs b/lightning/src/ln/chan_utils.rs
@@ -31,6 +31,7 @@ use bitcoin::secp256k1::{Secp256k1, Signature, Message};
 use bitcoin::secp256k1::Error as SecpError;
 use bitcoin::secp256k1;
 
+use alloc::vec::Vec;
 use std::cmp;
 use ln::chan_utils;
 use util::transaction_utils::sort_outputs;
@@ -1235,6 +1236,7 @@ fn script_for_p2wpkh(key: &PublicKey) -> Script {
 mod tests {
 	use super::CounterpartyCommitmentSecrets;
 	use hex;
+	use alloc::vec::Vec;
 
 	#[test]
 	fn test_per_commitment_storage() {
diff --git a/lightning/src/ln/chanmon_update_fail_tests.rs b/lightning/src/ln/chanmon_update_fail_tests.rs
@@ -37,6 +37,8 @@ use ln::functional_test_utils::*;
 
 use util::test_utils;
 
+use alloc::{vec, vec::Vec};
+
 // If persister_fail is true, we have the persister return a PermanentFailure
 // instead of the higher-level ChainMonitor.
 fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -39,6 +39,7 @@ use util::errors::APIError;
 use util::config::{UserConfig,ChannelConfig};
 use util::scid_utils::scid_from_parts;
 
+use alloc::{string::String, vec, vec::Vec};
 use std;
 use std::{cmp,mem,fmt};
 use std::ops::Deref;
@@ -4878,6 +4879,7 @@ mod tests {
 	use bitcoin::hashes::Hash;
 	use bitcoin::hash_types::{Txid, WPubkeyHash};
 	use std::sync::Arc;
+	use alloc::{vec, vec::Vec};
 
 	struct TestFeeEstimator {
 		fee_est: u32
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -61,6 +61,7 @@ use util::chacha20::{ChaCha20, ChaChaReader};
 use util::logger::Logger;
 use util::errors::APIError;
 
+use alloc::{string::String, vec::Vec};
 use std::{cmp, mem};
 use std::collections::{HashMap, hash_map, HashSet};
 use std::io::{Cursor, Read};
diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs
@@ -22,6 +22,7 @@
 //! [BOLT #9]: https://github.com/lightningnetwork/lightning-rfc/blob/master/09-features.md
 //! [messages]: crate::ln::msgs
 
+use alloc::vec::Vec;
 use std::{cmp, fmt};
 use std::marker::PhantomData;
 
@@ -31,6 +32,7 @@ use ln::msgs::DecodeError;
 use util::ser::{Readable, Writeable, Writer};
 
 mod sealed {
+	use alloc::vec::Vec;
 	use ln::features::Features;
 
 	/// The context in which [`Features`] are applicable. Defines which features are required and
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
@@ -39,6 +39,7 @@ use bitcoin::hash_types::BlockHash;
 
 use bitcoin::secp256k1::key::PublicKey;
 
+use alloc::{vec, vec::Vec};
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Mutex;
diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
@@ -50,7 +50,9 @@ use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 
 use regex;
 
-use std::collections::{BTreeSet, HashMap, HashSet};
+use alloc::{vec, vec::Vec};
+use alloc::collections::BTreeSet;
+use std::collections::{HashMap, HashSet};
 use std::default::Default;
 use std::sync::Mutex;
 
diff --git a/lightning/src/ln/mod.rs b/lightning/src/ln/mod.rs
@@ -69,6 +69,7 @@ pub struct PaymentPreimage(pub [u8;32]);
 #[derive(Hash, Copy, Clone, PartialEq, Eq, Debug)]
 pub struct PaymentSecret(pub [u8;32]);
 
+use alloc::vec::Vec;
 use bitcoin::bech32;
 use bitcoin::bech32::{Base32Len, FromBase32, ToBase32, WriteBase32, u5};
 
diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
@@ -32,6 +32,7 @@ use bitcoin::hash_types::{Txid, BlockHash};
 
 use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 
+use alloc::{string::String, vec, vec::Vec};
 use std::{cmp, fmt};
 use std::fmt::Debug;
 use std::io::Read;
@@ -865,6 +866,7 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
 }
 
 mod fuzzy_internal_msgs {
+	use alloc::vec::Vec;
 	use ln::PaymentSecret;
 
 	// These types aren't intended to be pub, but are exposed for direct fuzzing (as we deserialize
@@ -1839,6 +1841,7 @@ mod tests {
 	use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::{Secp256k1, Message};
 
+	use alloc::{string::String, vec, vec::Vec};
 	use std::io::Cursor;
 
 	#[test]
diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
@@ -32,6 +32,7 @@ use util::logger::Logger;
 use util::ser::{Readable, ReadableArgs, Writer, Writeable, VecWriter};
 use util::byte_utils;
 
+use alloc::{vec, vec::Vec};
 use std::collections::HashMap;
 use std::cmp;
 use std::ops::Deref;
diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs
@@ -32,6 +32,7 @@ use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1::key::SecretKey;
 
+use alloc::{vec, vec::Vec};
 use std::default::Default;
 use std::io;
 
diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
@@ -27,6 +27,7 @@ use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1;
 
+use alloc::vec::Vec;
 use std::io::Cursor;
 use std::ops::Deref;
 
@@ -478,6 +479,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 
 #[cfg(test)]
 mod tests {
+	use alloc::{vec, vec::Vec};
 	use ln::PaymentHash;
 	use ln::features::{ChannelFeatures, NodeFeatures};
 	use routing::router::{Route, RouteHop};
diff --git a/lightning/src/ln/peer_channel_encryptor.rs b/lightning/src/ln/peer_channel_encryptor.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use alloc::vec::Vec;
+
 use ln::msgs::LightningError;
 use ln::msgs;
 
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
@@ -30,7 +30,8 @@ use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::logger::Logger;
 use routing::network_graph::NetGraphMsgHandler;
 
-use std::collections::{HashMap,hash_map,HashSet,LinkedList};
+use alloc::{collections::LinkedList, vec::Vec};
+use std::collections::{HashMap,hash_map,HashSet};
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{cmp, error, hash, fmt, mem};
@@ -1416,6 +1417,7 @@ mod tests {
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::secp256k1::key::{SecretKey, PublicKey};
 
+	use alloc::vec::Vec;
 	use std;
 	use std::sync::{Arc, Mutex};
 	use std::sync::atomic::Ordering;
diff --git a/lightning/src/ln/reorg_tests.rs b/lightning/src/ln/reorg_tests.rs
@@ -22,8 +22,10 @@ use util::ser::{ReadableArgs, Writeable};
 use bitcoin::blockdata::block::{Block, BlockHeader};
 use bitcoin::hash_types::BlockHash;
 
+use alloc::{vec, vec::Vec};
 use std::collections::HashMap;
 use std::mem;
+use std::default::Default;
 
 use ln::functional_test_utils::*;
 
diff --git a/lightning/src/ln/wire.rs b/lightning/src/ln/wire.rs
@@ -351,6 +351,7 @@ impl Encode for msgs::GossipTimestampFilter {
 mod tests {
 	use super::*;
 	use util::byte_utils;
+	use alloc::vec::Vec;
 
 	// Big-endian wire encoding of Pong message (type = 19, byteslen = 2).
 	const ENCODED_PONG: [u8; 6] = [0u8, 19u8, 0u8, 2u8, 0u8, 0u8];
diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
@@ -32,12 +32,12 @@ use util::logger::Logger;
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
 
+use alloc::{string::String, vec, vec::Vec};
+use alloc::collections::{BTreeMap, btree_map::Entry as BtreeEntry};
 use std::{cmp, fmt};
 use std::sync::{RwLock, RwLockReadGuard};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Mutex;
-use std::collections::BTreeMap;
-use std::collections::btree_map::Entry as BtreeEntry;
 use std::ops::Deref;
 use bitcoin::hashes::hex::ToHex;
 
@@ -1129,6 +1129,7 @@ mod tests {
 	use bitcoin::secp256k1::key::{PublicKey, SecretKey};
 	use bitcoin::secp256k1::{All, Secp256k1};
 
+	use alloc::vec::Vec;
 	use std::sync::Arc;
 
 	fn create_net_graph_msg_handler() -> (Secp256k1<All>, NetGraphMsgHandler<Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>) {
diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
@@ -21,8 +21,10 @@ use routing::network_graph::{NetworkGraph, RoutingFees};
 use util::ser::{Writeable, Readable};
 use util::logger::Logger;
 
+use alloc::{vec, vec::Vec};
+use alloc::collections::BinaryHeap;
 use std::cmp;
-use std::collections::{HashMap, BinaryHeap};
+use std::collections::HashMap;
 use std::ops::Deref;
 
 /// A hop in a route
@@ -1186,6 +1188,7 @@ mod tests {
 	use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::{Secp256k1, All};
 
+	use alloc::{vec, vec::Vec};
 	use std::sync::Arc;
 
 	// Using the same keys for LN and BTC ids
@@ -3938,6 +3941,7 @@ mod benches {
 	use super::*;
 	use util::logger::{Logger, Record};
 
+	use alloc::vec::Vec;
 	use test::Bencher;
 
 	struct DummyLogger {}
diff --git a/lightning/src/util/chacha20.rs b/lightning/src/util/chacha20.rs
@@ -318,6 +318,7 @@ impl<'a, R: io::Read> io::Read for ChaChaReader<'a, R> {
 
 #[cfg(test)]
 mod test {
+	use alloc::{vec, vec::Vec};
 	use std::iter::repeat;
 
 	use super::ChaCha20;
diff --git a/lightning/src/util/enforcing_trait_impls.rs b/lightning/src/util/enforcing_trait_impls.rs
@@ -11,6 +11,7 @@ use ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, HolderCommitment
 use ln::{chan_utils, msgs};
 use chain::keysinterface::{Sign, InMemorySigner, BaseSign};
 
+use alloc::vec::Vec;
 use std::cmp;
 use std::sync::{Mutex, Arc};
 
diff --git a/lightning/src/util/errors.rs b/lightning/src/util/errors.rs
@@ -9,6 +9,7 @@
 
 //! Error types live here.
 
+use alloc::string::String;
 use std::fmt;
 
 /// Indicates an error on the client's part (usually some variant of attempting to use too-low or
diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
@@ -23,6 +23,7 @@ use bitcoin::blockdata::script::Script;
 
 use bitcoin::secp256k1::key::PublicKey;
 
+use alloc::vec::Vec;
 use std::time::Duration;
 
 /// An Event which you should probably take some action in response to.
diff --git a/lightning/src/util/message_signing.rs b/lightning/src/util/message_signing.rs
@@ -20,6 +20,7 @@
 //! https://lightning.readthedocs.io/lightning-signmessage.7.html
 //! https://api.lightning.community/#signmessage
 
+use alloc::{string::String, vec::Vec};
 use crate::util::zbase32;
 use bitcoin::hashes::{sha256d, Hash};
 use bitcoin::secp256k1::recovery::{RecoverableSignature, RecoveryId};
diff --git a/lightning/src/util/poly1305.rs b/lightning/src/util/poly1305.rs
@@ -205,6 +205,7 @@ impl Poly1305 {
 
 #[cfg(test)]
 mod test {
+	use alloc::vec::Vec;
 	use std::iter::repeat;
 
 	use util::poly1305::Poly1305;
diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
@@ -10,6 +10,7 @@
 //! A very simple serialization framework which is used to serialize/deserialize messages as well
 //! as ChannelsManagers and ChannelMonitors.
 
+use alloc::{vec, vec::Vec};
 use std::io::{Read, Write};
 use std::collections::HashMap;
 use std::hash::Hash;
diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
@@ -180,6 +180,7 @@ macro_rules! impl_writeable_len_match {
 
 #[cfg(test)]
 mod tests {
+	use alloc::vec::Vec;
 	use std::io::{Cursor, Read};
 	use ln::msgs::DecodeError;
 	use util::ser::{Readable, Writeable, HighZeroBytesDroppedVarInt, VecWriter};
diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
@@ -36,6 +36,7 @@ use bitcoin::secp256k1::recovery::RecoverableSignature;
 
 use regex;
 
+use alloc::{string::String, vec, vec::Vec};
 use std::time::Duration;
 use std::sync::{Mutex, Arc};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
diff --git a/lightning/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs
@@ -14,6 +14,7 @@ use bitcoin::consensus::encode::VarInt;
 
 use ln::msgs::MAX_VALUE_MSAT;
 
+use alloc::vec::Vec;
 use std::cmp::Ordering;
 
 pub fn sort_outputs<T, C : Fn(&T, &T) -> Ordering>(outputs: &mut Vec<(TxOut, T)>, tie_breaker: C) {
@@ -83,6 +84,8 @@ mod tests {
 
 	use hex::decode;
 
+	use alloc::vec;
+
 	#[test]
 	fn sort_output_by_value() {
 		let txout1 = TxOut {
diff --git a/lightning/src/util/zbase32.rs b/lightning/src/util/zbase32.rs
@@ -8,6 +8,8 @@
  * at your option.
 */
 
+use alloc::{string::String, vec::Vec};
+
 const ALPHABET: &'static [u8] = b"ybndrfg8ejkmcpqxot1uwisza345h769";
 
 /// Encodes some bytes as a zbase32 string
