Skip to content

Commit 735f96c

Browse files
devrandomGeneFerneau
authored andcommitted
f use prelude::*
1 parent dfdded0 commit 735f96c

33 files changed

+48
-43
lines changed

lightning/src/chain/chainmonitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use util::logger::Logger;
3737
use util::events;
3838
use util::events::EventHandler;
3939

40-
use alloc::vec::Vec;
40+
use prelude::*;
4141
use std::collections::{HashMap, hash_map};
4242
use std::sync::RwLock;
4343
use core::ops::Deref;

lightning/src/chain/channelmonitor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, U48};
5151
use util::byte_utils;
5252
use util::events::Event;
5353

54-
use alloc::{vec, vec::Vec};
54+
use prelude::*;
5555
use std::collections::{HashMap, HashSet};
5656
use core::{cmp, mem};
5757
use std::io::Error;
@@ -2912,7 +2912,7 @@ mod tests {
29122912
use bitcoin::secp256k1::Secp256k1;
29132913
use std::sync::{Arc, Mutex};
29142914
use chain::keysinterface::InMemorySigner;
2915-
use alloc::{vec, vec::Vec};
2915+
use prelude::*;
29162916

29172917
#[test]
29182918
fn test_prune_preimages() {

lightning/src/chain/keysinterface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use ln::chan_utils;
3737
use ln::chan_utils::{HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, HolderCommitmentTransaction, ChannelTransactionParameters, CommitmentTransaction};
3838
use ln::msgs::UnsignedChannelAnnouncement;
3939

40-
use alloc::vec::Vec;
40+
use prelude::*;
4141
use std::collections::HashSet;
4242
use core::sync::atomic::{AtomicUsize, Ordering};
4343
use std::io::Error;

lightning/src/chain/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitor
1818
use chain::keysinterface::Sign;
1919
use chain::transaction::{OutPoint, TransactionData};
2020

21-
use alloc::vec::Vec;
21+
use prelude::*;
2222

2323
pub mod chaininterface;
2424
pub mod chainmonitor;

lightning/src/chain/onchaintx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use util::logger::Logger;
3232
use util::ser::{Readable, ReadableArgs, Writer, Writeable, VecWriter};
3333
use util::byte_utils;
3434

35-
use alloc::vec::Vec;
35+
use prelude::*;
3636
use std::collections::HashMap;
3737
use core::cmp;
3838
use core::ops::Deref;

lightning/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ pub mod util;
4242
pub mod chain;
4343
pub mod ln;
4444
pub mod routing;
45+
46+
mod prelude {
47+
pub use alloc::{vec, vec::Vec, string::String};
48+
}

lightning/src/ln/chan_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use bitcoin::secp256k1::{Secp256k1, Signature, Message};
3131
use bitcoin::secp256k1::Error as SecpError;
3232
use bitcoin::secp256k1;
3333

34-
use alloc::vec::Vec;
34+
use prelude::*;
3535
use core::cmp;
3636
use ln::chan_utils;
3737
use util::transaction_utils::sort_outputs;
@@ -1236,7 +1236,7 @@ fn script_for_p2wpkh(key: &PublicKey) -> Script {
12361236
mod tests {
12371237
use super::CounterpartyCommitmentSecrets;
12381238
use hex;
1239-
use alloc::vec::Vec;
1239+
use prelude::*;
12401240

12411241
#[test]
12421242
fn test_per_commitment_storage() {

lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use ln::functional_test_utils::*;
3838

3939
use util::test_utils;
4040

41-
use alloc::{vec, vec::Vec};
41+
use prelude::*;
4242
use std::collections::HashMap;
4343

4444
// If persister_fail is true, we have the persister return a PermanentFailure

lightning/src/ln/channel.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use util::errors::APIError;
4040
use util::config::{UserConfig,ChannelConfig};
4141
use util::scid_utils::scid_from_parts;
4242

43-
use alloc::{string::String, vec, vec::Vec};
43+
use prelude::*;
4444
use core::{cmp,mem,fmt};
4545
use core::ops::Deref;
4646
#[cfg(any(test, feature = "fuzztarget"))]
@@ -4929,7 +4929,7 @@ mod tests {
49294929
use bitcoin::hashes::Hash;
49304930
use bitcoin::hash_types::{Txid, WPubkeyHash};
49314931
use std::sync::Arc;
4932-
use alloc::{vec, vec::Vec};
4932+
use prelude::*;
49334933

49344934
struct TestFeeEstimator {
49354935
fee_est: u32

lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ use util::chacha20::{ChaCha20, ChaChaReader};
6161
use util::logger::Logger;
6262
use util::errors::APIError;
6363

64-
use alloc::{string::String, vec::Vec};
64+
use prelude::*;
6565
use core::{cmp, mem};
6666
use core::cell::RefCell;
6767
use std::collections::{HashMap, hash_map, HashSet};

0 commit comments

Comments
 (0)