Fix formatting issues after rebase

Author: chuksys

src/ffi/types.rs

@@ -56,50 +56,10 @@ pub use crate::payment::store::{
 };
 pub use crate::payment::UnifiedPaymentResult;
 
-pub use lightning::chain::channelmonitor::BalanceSource;
-pub use lightning::events::{ClosureReason, PaymentFailureReason};
-pub use lightning::ln::types::ChannelId;
-pub use lightning::offers::offer::OfferId;
 pub use lightning::onion_message::dns_resolution::HumanReadableName as LdkHumanReadableName;
-pub use lightning::routing::gossip::{NodeAlias, NodeId, RoutingFees};
-pub use lightning::routing::router::RouteParametersConfig;
-pub use lightning_types::string::UntrustedString;
-
-pub use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
-
-pub use lightning_invoice::{Description, SignedRawBolt11Invoice};
-
-pub use lightning_liquidity::lsps0::ser::LSPSDateTime;
-pub use lightning_liquidity::lsps1::msgs::{
-	LSPS1ChannelInfo, LSPS1OrderId, LSPS1OrderParams, LSPS1PaymentState,
-};
-
-pub use bitcoin::{Address, BlockHash, FeeRate, Network, OutPoint, Txid};
-
-pub use bip39::Mnemonic;
 
-pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};
-
-use crate::builder::sanitize_alias;
-use crate::error::Error;
 use crate::{hex_utils, SocketAddress, UniffiCustomTypeConverter, UserChannelId};
 
-use bitcoin::hashes::sha256::Hash as Sha256;
-use bitcoin::hashes::Hash;
-use bitcoin::secp256k1::PublicKey;
-use lightning::ln::channelmanager::PaymentId;
-use lightning::offers::invoice::Bolt12Invoice as LdkBolt12Invoice;
-use lightning::offers::offer::{Amount as LdkAmount, Offer as LdkOffer};
-use lightning::offers::refund::Refund as LdkRefund;
-use lightning::util::ser::Writeable;
-use lightning_invoice::{Bolt11Invoice as LdkBolt11Invoice, Bolt11InvoiceDescriptionRef};
-
-use std::convert::TryInto;
-use std::ops::Deref;
-use std::str::FromStr;
-use std::sync::Arc;
-use std::time::Duration;
-
 impl UniffiCustomTypeConverter for PublicKey {
 	type Builtin = String;
 

src/lib.rs

@@ -136,13 +136,13 @@ use payment::{
 use peer_store::{PeerInfo, PeerStore};
 use runtime::Runtime;
 use types::{
-	Broadcaster, BumpTransactionEventHandler, ChainMonitor, ChannelManager, Graph, HRNResolver, 
-	KeysManager, OnionMessenger, PaymentStore, PeerManager, Router, Scorer, Sweeper,
-	Wallet,
+	Broadcaster, BumpTransactionEventHandler, ChainMonitor, ChannelManager, Graph, HRNResolver,
+	KeysManager, OnionMessenger, PaymentStore, PeerManager, Router, Scorer, Sweeper, Wallet,
+};
+pub use types::{
+	ChannelDetails, CustomTlvRecord, DynStore, PeerDetails, SyncAndAsyncKVStore, UserChannelId,
 };
-pub use types::{ChannelDetails, CustomTlvRecord, DynStore, PeerDetails, SyncAndAsyncKVStore, UserChannelId};
 
-use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
 use lightning::chain::BestBlock;
 use lightning::events::bump_transaction::Wallet as LdkWallet;
 use lightning::impl_writeable_tlv_based;
@@ -152,6 +152,7 @@ use lightning::ln::msgs::SocketAddress;
 use lightning::routing::gossip::NodeAlias;
 use lightning::util::persist::KVStoreSync;
 use lightning_background_processor::process_events_async;
+use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
 use payment::asynchronous::om_mailbox::OnionMessageMailbox;
 use rand::Rng;
 pub use {

src/payment/unified.rs

@@ -14,14 +14,14 @@
 //! [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
 //! [BOLT 11]: https://github.com/lightning/bolts/blob/master/11-payment-encoding.md
 //! [BOLT 12]: https://github.com/lightning/bolts/blob/master/12-offer-encoding.md
-use std::sync::Arc;
-use std::vec::IntoIter;
 use crate::error::Error;
 use crate::ffi::maybe_wrap;
 use crate::logger::{log_error, LdkLogger, Logger};
 use crate::payment::{Bolt11Payment, Bolt12Payment, OnchainPayment};
 use crate::types::HRNResolver;
 use crate::Config;
+use std::sync::Arc;
+use std::vec::IntoIter;
 
 use lightning::ln::channelmanager::PaymentId;
 use lightning::offers::offer::Offer;

src/types.rs

@@ -48,6 +48,7 @@ where
 
 use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
 
+/// A type alias for [`SyncAndAsyncKVStore`] with `Sync`/`Send` markers;
 pub type DynStore = dyn SyncAndAsyncKVStore + Sync + Send;
 
 pub type Persister = MonitorUpdatingPersister<

tests/integration_tests_rust.rs

@@ -6,10 +6,10 @@
 // accordance with one or both of these licenses.
 
 mod common;
+use lightning::util::persist::KVStoreSync;
 use std::collections::HashSet;
 use std::str::FromStr;
 use std::sync::Arc;
-use lightning::util::persist::KVStoreSync;
 
 use bitcoin::address::NetworkUnchecked;
 use bitcoin::hashes::sha256::Hash as Sha256Hash;