milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Update PushBytes::read_scriptint(x) to x.read_scriptint()

This commit is contained in:
Shing Him Ng 2024-06-16 17:07:37 -05:00
parent 406e3486ab
commit e7f33a2a12
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitcoin/src/blockdata/block.rs
View File

@ -19,7 +19,6 @@ use crate::consensus::{encode, Decodable, Encodable, Params};
use crate::internal_macros::{impl_consensus_encoding, impl_hashencode}; use crate::internal_macros::{impl_consensus_encoding, impl_hashencode};
use crate::pow::{CompactTarget, Target, Work}; use crate::pow::{CompactTarget, Target, Work};
use crate::prelude::*; use crate::prelude::*;
use crate::script::PushBytes;
use crate::{merkle_tree, VarInt}; use crate::{merkle_tree, VarInt};
hashes::hash_newtype! { hashes::hash_newtype! {
@ -381,7 +380,7 @@ impl Block {
match push.map_err(|_| Bip34Error::NotPresent)? { match push.map_err(|_| Bip34Error::NotPresent)? {
script::Instruction::PushBytes(b) => { script::Instruction::PushBytes(b) => {
// Check that the number is encoded in the minimal way. // Check that the number is encoded in the minimal way.
let h = PushBytes::read_scriptint(b) let h = b.read_scriptint()
.map_err(|_e| Bip34Error::UnexpectedPush(b.as_bytes().to_vec()))?; .map_err(|_e| Bip34Error::UnexpectedPush(b.as_bytes().to_vec()))?;
if h < 0 { if h < 0 {
Err(Bip34Error::NegativeHeight) Err(Bip34Error::NegativeHeight)

2
bitcoin/src/blockdata/script/instruction.rs
View File

@ -76,7 +76,7 @@ impl<'a> Instruction<'a> {
_ => None, _ => None,
} }
} }
Instruction::PushBytes(bytes) => match PushBytes::read_scriptint(bytes) { Instruction::PushBytes(bytes) => match bytes.read_scriptint() {
Ok(v) => Some(v), Ok(v) => Some(v),
_ => None, _ => None,
}, },

2
fuzz/fuzz_targets/bitcoin/deserialize_script.rs
View File

@ -23,7 +23,7 @@ fn do_test(data: &[u8]) {
// reserialized as numbers. (For -1 through 16, this will use special ops; for // reserialized as numbers. (For -1 through 16, this will use special ops; for
// others it'll just reserialize them as pushes.) // others it'll just reserialize them as pushes.)
if bytes.len() == 1 && bytes[0] != 0x80 && bytes[0] != 0x00 { if bytes.len() == 1 && bytes[0] != 0x80 && bytes[0] != 0x00 {
if let Ok(num) = script::PushBytes::read_scriptint(bytes) { if let Ok(num) = bytes.read_scriptint() {
b = b.push_int(num); b = b.push_int(num);
} else { } else {
b = b.push_slice(bytes); b = b.push_slice(bytes);