]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #3359 from TheBlueMatt/2024-10-less-types-re-export
authorGursharan Singh <3442979+G8XSU@users.noreply.github.com>
Fri, 18 Oct 2024 21:35:49 +0000 (14:35 -0700)
committerGitHub <noreply@github.com>
Fri, 18 Oct 2024 21:35:49 +0000 (14:35 -0700)
Remove deprecated re-exports

1  2 
lightning-background-processor/src/lib.rs
lightning/src/chain/channelmonitor.rs
lightning/src/chain/onchaintx.rs
lightning/src/chain/package.rs
lightning/src/ln/functional_tests.rs
lightning/src/ln/invoice_utils.rs
lightning/src/sign/ecdsa.rs
lightning/src/sign/mod.rs
lightning/src/util/test_channel_signer.rs

Simple merge
Simple merge
index aefd1c5deb7230f474fd16cdc16fd2fb067ad6f6,1b96acd6772aef403e9b9ce7f1a4ed2e0344c7c8..f5745e93dc3e1c451c018688a8190d8a560a9ace
@@@ -24,11 -24,10 +24,11 @@@ use bitcoin::secp256k1::{SecretKey,Publ
  use bitcoin::sighash::EcdsaSighashType;
  use bitcoin::transaction::Version;
  
- use crate::ln::types::PaymentPreimage;
+ use crate::types::payment::PaymentPreimage;
  use crate::ln::chan_utils::{self, TxCreationKeys, HTLCOutputInCommitment};
- use crate::ln::features::ChannelTypeFeatures;
+ use crate::types::features::ChannelTypeFeatures;
  use crate::ln::channel_keys::{DelayedPaymentBasepoint, HtlcBasepoint};
 +use crate::ln::channelmanager::MIN_CLTV_EXPIRY_DELTA;
  use crate::ln::msgs::DecodeError;
  use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT, compute_feerate_sat_per_1000_weight, FEERATE_FLOOR_SATS_PER_KW};
  use crate::chain::transaction::MaybeSignedTransaction;
Simple merge
Simple merge
Simple merge
Simple merge