Skip to content

Commit 42ab358

Browse files
authored
Merge pull request #1808 from TheBlueMatt/2022-10-112-bindings-init
Backport #1805 and #1807 to 0.0.112-bindings
2 parents 3b2f694 + 17082ec commit 42ab358

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lightning/src/chain/keysinterface.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ pub trait BaseSign {
352352
/// Computes the signature for a commitment transaction's anchor output used as an
353353
/// input within `anchor_tx`, which spends the commitment transaction, at index `input`.
354354
fn sign_holder_anchor_input(
355-
&self, anchor_tx: &mut Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
355+
&self, anchor_tx: &Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
356356
) -> Result<Signature, ()>;
357357

358358
/// Signs a channel announcement message with our funding key and our node secret key (aka
@@ -790,7 +790,7 @@ impl BaseSign for InMemorySigner {
790790
}
791791

792792
fn sign_holder_anchor_input(
793-
&self, anchor_tx: &mut Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
793+
&self, anchor_tx: &Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
794794
) -> Result<Signature, ()> {
795795
let witness_script = chan_utils::get_anchor_redeemscript(&self.holder_channel_pubkeys.funding_pubkey);
796796
let sighash = sighash::SighashCache::new(&*anchor_tx).segwit_signature_hash(

lightning/src/ln/msgs.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ pub enum DecodeError {
6666
/// A length descriptor in the packet didn't describe the later data correctly
6767
BadLengthDescriptor,
6868
/// Error from std::io
69-
Io(/// (C-not exported) as ErrorKind doesn't have a reasonable mapping
70-
io::ErrorKind),
69+
Io(io::ErrorKind),
7170
/// The message included zlib-compressed values, which we don't support.
7271
UnsupportedCompression,
7372
}

lightning/src/util/enforcing_trait_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ impl BaseSign for EnforcingSigner {
201201
}
202202

203203
fn sign_holder_anchor_input(
204-
&self, anchor_tx: &mut Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
204+
&self, anchor_tx: &Transaction, input: usize, secp_ctx: &Secp256k1<secp256k1::All>,
205205
) -> Result<Signature, ()> {
206206
debug_assert!(MIN_CHAN_DUST_LIMIT_SATOSHIS > ANCHOR_OUTPUT_VALUE_SATOSHI);
207207
// As long as our minimum dust limit is enforced and is greater than our anchor output

0 commit comments

Comments
 (0)