Skip to content

Commit 6cb9919

Browse files
arik-soarik-so
committed
Move keysinterface.rs to a directory-level module called sign.
1 parent ec3de62 commit 6cb9919

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+109
-108
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
3737
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
3838
use lightning::chain::transaction::OutPoint;
3939
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
40-
use lightning::chain::keysinterface::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
40+
use lightning::sign::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
4141
use lightning::events;
4242
use lightning::events::MessageSendEventsProvider;
4343
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};

‎fuzz/src/full_stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
3434
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
3535
use lightning::chain::chainmonitor;
3636
use lightning::chain::transaction::OutPoint;
37-
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
37+
use lightning::sign::{InMemorySigner, Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
3838
use lightning::events::Event;
3939
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
4040
use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentId, RecipientOnionFields, Retry};

‎fuzz/src/invoice_request_deser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self}
1111
use crate::utils::test_logger;
1212
use core::convert::{Infallible, TryFrom};
1313
use lightning::blinded_path::BlindedPath;
14-
use lightning::chain::keysinterface::EntropySource;
14+
use lightning::sign::EntropySource;
1515
use lightning::ln::PaymentHash;
1616
use lightning::ln::features::BlindedHopFeatures;
1717
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};

‎fuzz/src/onion_message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
55
use bitcoin::secp256k1::ecdh::SharedSecret;
66
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
77

8-
use lightning::chain::keysinterface::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
8+
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
99
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1010
use lightning::ln::script::ShutdownScript;
1111
use lightning::util::enforcing_trait_impls::EnforcingSigner;

‎fuzz/src/refund_deser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
1111
use crate::utils::test_logger;
1212
use core::convert::{Infallible, TryFrom};
1313
use lightning::blinded_path::BlindedPath;
14-
use lightning::chain::keysinterface::EntropySource;
14+
use lightning::sign::EntropySource;
1515
use lightning::ln::PaymentHash;
1616
use lightning::ln::features::BlindedHopFeatures;
1717
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};

‎lightning-background-processor/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern crate lightning_rapid_gossip_sync;
2525
use lightning::chain;
2626
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
2727
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
28-
use lightning::chain::keysinterface::{EntropySource, NodeSigner, SignerProvider};
28+
use lightning::sign::{EntropySource, NodeSigner, SignerProvider};
2929
use lightning::events::{Event, PathFailure};
3030
#[cfg(feature = "std")]
3131
use lightning::events::{EventHandler, EventsProvider};
@@ -506,11 +506,11 @@ use core::task;
506506
/// # use lightning_background_processor::{process_events_async, GossipSync};
507507
/// # type MyBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
508508
/// # type MyFeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
509-
/// # type MyNodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
509+
/// # type MyNodeSigner = dyn lightning::sign::NodeSigner + Send + Sync;
510510
/// # type MyUtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
511511
/// # type MyFilter = dyn lightning::chain::Filter + Send + Sync;
512512
/// # type MyLogger = dyn lightning::util::logger::Logger + Send + Sync;
513-
/// # type MyChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<MyFilter>, Arc<MyBroadcaster>, Arc<MyFeeEstimator>, Arc<MyLogger>, Arc<MyPersister>>;
513+
/// # type MyChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::sign::InMemorySigner, Arc<MyFilter>, Arc<MyBroadcaster>, Arc<MyFeeEstimator>, Arc<MyLogger>, Arc<MyPersister>>;
514514
/// # type MyPeerManager = lightning::ln::peer_handler::SimpleArcPeerManager<MySocketDescriptor, MyChainMonitor, MyBroadcaster, MyFeeEstimator, MyUtxoLookup, MyLogger>;
515515
/// # type MyNetworkGraph = lightning::routing::gossip::NetworkGraph<Arc<MyLogger>>;
516516
/// # type MyGossipSync = lightning::routing::gossip::P2PGossipSync<Arc<MyNetworkGraph>, Arc<MyUtxoLookup>, Arc<MyLogger>>;
@@ -825,7 +825,7 @@ mod tests {
825825
use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1};
826826
use lightning::chain::{BestBlock, Confirm, chainmonitor};
827827
use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
828-
use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
828+
use lightning::sign::{InMemorySigner, KeysManager};
829829
use lightning::chain::transaction::OutPoint;
830830
use lightning::events::{Event, PathFailure, MessageSendEventsProvider, MessageSendEvent};
831831
use lightning::{get_event_msg, get_event};

‎lightning-block-sync/src/init.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
4747
/// use lightning::chain::channelmonitor::ChannelMonitor;
4848
/// use lightning::chain::chaininterface::BroadcasterInterface;
4949
/// use lightning::chain::chaininterface::FeeEstimator;
50-
/// use lightning::chain::keysinterface;
51-
/// use lightning::chain::keysinterface::{EntropySource, NodeSigner, SignerProvider};
50+
/// use lightning::sign;
51+
/// use lightning::sign::{EntropySource, NodeSigner, SignerProvider};
5252
/// use lightning::ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
5353
/// use lightning::routing::router::Router;
5454
/// use lightning::util::config::UserConfig;

‎lightning-invoice/src/payment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use bitcoin_hashes::Hash;
1515

1616
use lightning::chain;
1717
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
18-
use lightning::chain::keysinterface::{NodeSigner, SignerProvider, EntropySource};
18+
use lightning::sign::{NodeSigner, SignerProvider, EntropySource};
1919
use lightning::ln::PaymentHash;
2020
use lightning::ln::channelmanager::{ChannelManager, PaymentId, Retry, RetryableSendFailure, RecipientOnionFields};
2121
use lightning::routing::router::{PaymentParameters, RouteParameters, Router};

‎lightning-invoice/src/utils.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use bech32::ToBase32;
77
use bitcoin_hashes::Hash;
88
use lightning::chain;
99
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
10-
use lightning::chain::keysinterface::{Recipient, NodeSigner, SignerProvider, EntropySource};
10+
use lightning::sign::{Recipient, NodeSigner, SignerProvider, EntropySource};
1111
use lightning::ln::{PaymentHash, PaymentSecret};
1212
use lightning::ln::channelmanager::{ChannelDetails, ChannelManager, MIN_FINAL_CLTV_EXPIRY_DELTA};
1313
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_CLTV_EXPIRY_DELTA};
@@ -50,7 +50,7 @@ use core::time::Duration;
5050
/// invoices in its `sign_invoice` implementation ([`PhantomKeysManager`] satisfies this
5151
/// requirement).
5252
///
53-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
53+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
5454
/// [`ChannelManager::get_phantom_route_hints`]: lightning::ln::channelmanager::ChannelManager::get_phantom_route_hints
5555
/// [`ChannelManager::create_inbound_payment`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment
5656
/// [`ChannelManager::create_inbound_payment_for_hash`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
@@ -107,7 +107,7 @@ where
107107
/// invoices in its `sign_invoice` implementation ([`PhantomKeysManager`] satisfies this
108108
/// requirement).
109109
///
110-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
110+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
111111
/// [`ChannelManager::get_phantom_route_hints`]: lightning::ln::channelmanager::ChannelManager::get_phantom_route_hints
112112
/// [`ChannelManager::create_inbound_payment`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment
113113
/// [`ChannelManager::create_inbound_payment_for_hash`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
@@ -227,7 +227,7 @@ where
227227
/// * Select up to three channels per node.
228228
/// * Select one hint from each node, up to three hints or until we run out of hints.
229229
///
230-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
230+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
231231
fn select_phantom_hints<L: Deref>(amt_msat: Option<u64>, phantom_route_hints: Vec<PhantomRouteHints>,
232232
logger: L) -> Vec<RouteHint>
233233
where
@@ -629,7 +629,7 @@ fn sort_and_filter_channels<L: Deref>(
629629
// previous channel to avoid announcing non-public channels.
630630
let new_now_public = channel.is_public && !entry.get().is_public;
631631
// Decide whether we prefer the currently selected channel with the node to the new one,
632-
// based on their inbound capacity.
632+
// based on their inbound capacity.
633633
let prefer_current = prefer_current_channel(min_inbound_capacity_msat, current_max_capacity,
634634
channel.inbound_capacity_msat);
635635
// If the public-ness of the channel has not changed (in which case simply defer to
@@ -768,7 +768,7 @@ mod test {
768768
use crate::{Currency, Description, InvoiceDescription, SignOrCreationError, CreationError};
769769
use bitcoin_hashes::{Hash, sha256};
770770
use bitcoin_hashes::sha256::Hash as Sha256;
771-
use lightning::chain::keysinterface::PhantomKeysManager;
771+
use lightning::sign::PhantomKeysManager;
772772
use lightning::events::{MessageSendEvent, MessageSendEventsProvider, Event};
773773
use lightning::ln::{PaymentPreimage, PaymentHash};
774774
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_FINAL_CLTV_EXPIRY_DELTA, PaymentId, RecipientOnionFields, Retry};
@@ -793,10 +793,10 @@ mod test {
793793

794794
// Minimum set, prefer candidate channel over minimum + buffer.
795795
assert_eq!(crate::utils::prefer_current_channel(Some(100), 105, 125), false);
796-
796+
797797
// Minimum set, both channels sufficient, prefer smaller current channel.
798798
assert_eq!(crate::utils::prefer_current_channel(Some(100), 115, 125), true);
799-
799+
800800
// Minimum set, both channels sufficient, prefer smaller candidate channel.
801801
assert_eq!(crate::utils::prefer_current_channel(Some(100), 200, 160), false);
802802

‎lightning-persister/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extern crate libc;
2020
use bitcoin::hash_types::{BlockHash, Txid};
2121
use bitcoin::hashes::hex::FromHex;
2222
use lightning::chain::channelmonitor::ChannelMonitor;
23-
use lightning::chain::keysinterface::{EntropySource, SignerProvider};
23+
use lightning::sign::{EntropySource, SignerProvider};
2424
use lightning::util::ser::{ReadableArgs, Writeable};
2525
use lightning::util::persist::KVStorePersister;
2626
use std::fs;

0 commit comments

Comments
 (0)