reorder imports

fuzz/src/chanmon_consistency.rs

@@ -35,8 +35,8 @@ use lightning::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr,
 use lightning::chain::transaction::OutPoint;
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::keysinterface::{KeysInterface, InMemoryChannelKeys};
-use lightning::ln::data_persister::ChannelDataPersister;
 use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret, ChannelManagerReadArgs};
+use lightning::ln::data_persister::ChannelDataPersister;
 use lightning::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, UpdateAddHTLC, Init};
 use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
@@ -48,8 +48,8 @@ use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 use lightning::routing::router::{Route, RouteHop};
 
 
-use utils::test_logger;
 use utils::test_data_persister::TestChanDataPersister;
+use utils::test_logger;
 
 use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 use bitcoin::secp256k1::Secp256k1;

fuzz/src/full_stack.rs

@@ -31,8 +31,8 @@ use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget,
 use lightning::chain::channelmonitor;
 use lightning::chain::transaction::OutPoint;
 use lightning::chain::keysinterface::{InMemoryChannelKeys, KeysInterface};
-use lightning::ln::data_persister::ChannelDataPersister;
 use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::ln::data_persister::ChannelDataPersister;
 use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
 use lightning::routing::router::get_route;
 use lightning::routing::network_graph::NetGraphMsgHandler;
@@ -41,8 +41,8 @@ use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
 use lightning::util::logger::Logger;
 use lightning::util::config::UserConfig;
 
-use utils::test_logger;
 use utils::test_data_persister::TestChanDataPersister;
+use utils::test_logger;
 
 use bitcoin::secp256k1::key::{PublicKey,SecretKey};
 use bitcoin::secp256k1::Secp256k1;

fuzz/src/utils/mod.rs

@@ -7,5 +7,5 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-pub mod test_logger;
 pub mod test_data_persister;
+pub mod test_logger;

lightning-data-persister/src/lib.rs

@@ -2,18 +2,18 @@ extern crate lightning;
 extern crate bitcoin;
 extern crate libc;
 
-use lightning::ln::data_persister::ChannelDataPersister;
+use bitcoin::hash_types::{BlockHash, Txid};
+use bitcoin::hashes::hex::{ToHex, FromHex};
 use lightning::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateErr};
 use lightning::chain::keysinterface::ChannelKeys;
 use lightning::chain::transaction::OutPoint;
+use lightning::ln::data_persister::ChannelDataPersister;
 use lightning::util::ser::{Writeable, Readable};
-use bitcoin::hash_types::{BlockHash, Txid};
-use bitcoin::hashes::hex::{ToHex, FromHex};
+use std::collections::HashMap;
 use std::fs;
-use std::path::Path;
 use std::io::{Error, ErrorKind, Cursor};
-use std::collections::HashMap;
 use std::marker::PhantomData;
+use std::path::Path;
 
 #[cfg(not(target_os = "windows"))]
 use std::os::unix::io::AsRawFd;
@@ -159,15 +159,15 @@ mod tests {
 	extern crate lightning;
 	extern crate bitcoin;
 	use crate::FilesystemPersister;
-	use lightning::ln::features::InitFeatures;
+	use bitcoin::blockdata::block::{Block, BlockHeader};
+	use lightning::{check_closed_broadcast, check_added_monitors};
 	use lightning::ln::data_persister::ChannelDataPersister;
+	use lightning::ln::features::InitFeatures;
 	use lightning::ln::functional_test_utils::*;
 	use lightning::ln::msgs::ErrorAction;
-	use lightning::{check_closed_broadcast, check_added_monitors};
 	use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
 	use lightning::util::events::{MessageSendEventsProvider, MessageSendEvent};
 	use lightning::util::test_utils;
-	use bitcoin::blockdata::block::{Block, BlockHeader};
 	use std::fs;
 
 	#[test]

lightning/src/util/test_utils.rs

@@ -14,10 +14,10 @@ use chain::channelmonitor;
 use chain::channelmonitor::MonitorEvent;
 use chain::transaction::OutPoint;
 use chain::keysinterface;
+use ln::data_persister::ChannelDataPersister;
 use ln::features::{ChannelFeatures, InitFeatures};
 use ln::msgs;
 use ln::msgs::OptionalField;
-use ln::data_persister::ChannelDataPersister;
 use util::enforcing_trait_impls::EnforcingChannelKeys;
 use util::events;
 use util::logger::{Logger, Level, Record};