From 69117a1f63231e8ee9821dfcecafafd7d8358774 Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Sat, 1 May 2021 10:22:35 +0200 Subject: [PATCH] Use Amount for verify_with_flags --- src/blockdata/script.rs | 6 +++--- src/blockdata/transaction.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blockdata/script.rs b/src/blockdata/script.rs index 7b94b822c6..4cfd795918 100644 --- a/src/blockdata/script.rs +++ b/src/blockdata/script.rs @@ -451,7 +451,7 @@ impl Script { #[cfg(feature="bitcoinconsensus")] /// Shorthand for [Self::verify_with_flags] with flag [bitcoinconsensus::VERIFY_ALL] pub fn verify (&self, index: usize, amount: u64, spending: &[u8]) -> Result<(), Error> { - self.verify_with_flags(index, amount, spending, ::bitcoinconsensus::VERIFY_ALL) + self.verify_with_flags(index, ::Amount::from_sat(amount), spending, ::bitcoinconsensus::VERIFY_ALL) } #[cfg(feature="bitcoinconsensus")] @@ -461,8 +461,8 @@ impl Script { /// * `amount` - the amount this script guards /// * `spending` - the transaction that attempts to spend the output holding this script /// * `flags` - verification flags, see [bitcoinconsensus::VERIFY_ALL] and similar - pub fn verify_with_flags>(&self, index: usize, amount: u64, spending: &[u8], flags: F) -> Result<(), Error> { - Ok(bitcoinconsensus::verify_with_flags (&self.0[..], amount, spending, index, flags.into())?) + pub fn verify_with_flags>(&self, index: usize, amount: ::Amount, spending: &[u8], flags: F) -> Result<(), Error> { + Ok(bitcoinconsensus::verify_with_flags (&self.0[..], amount.as_sat(), spending, index, flags.into())?) } /// Write the assembly decoding of the script bytes to the formatter. diff --git a/src/blockdata/transaction.rs b/src/blockdata/transaction.rs index b13ab9c0a1..c25db24e9a 100644 --- a/src/blockdata/transaction.rs +++ b/src/blockdata/transaction.rs @@ -478,7 +478,7 @@ impl Transaction { let flags: u32 = flags.into(); for (idx, input) in self.input.iter().enumerate() { if let Some(output) = spent(&input.previous_output) { - output.script_pubkey.verify_with_flags(idx, output.value, tx.as_slice(), flags)?; + output.script_pubkey.verify_with_flags(idx, ::Amount::from_sat(output.value), tx.as_slice(), flags)?; } else { return Err(script::Error::UnknownSpentOutput(input.previous_output.clone())); }