zecfoundation
/
rust-bitcoin
mirror of https://github.com/ZcashFoundation/rust-bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

script: fix broken push_int in script::Builder

This commit is contained in:
Andrew Poelstra 2016-07-14 15:15:34 +00:00
parent 9d2826d5d1
commit 93f103bdb5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "bitcoin"
version = "0.7.3"
version = "0.7.4"
authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
license = "CC0-1.0"
homepage = "https://github.com/apoelstra/rust-bitcoin/"

8
src/blockdata/script.rs
View File

@ -381,7 +381,7 @@ impl Builder {
pub fn push_int(mut self, data: i64) -> Builder {
// We can special-case -1, 1-16
if data == -1 || (data >= 1 && data <= 16) {
self.0.push((data + opcodes::OP_TRUE as i64) as u8);
self.0.push((data - 1 + opcodes::OP_TRUE as i64) as u8);
self
}
// We can also special-case zero
@ -521,10 +521,10 @@ mod test {
assert_eq!(&script[..], &comp[..]);
// small ints
script = script.push_int(1); comp.push(82u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(1); comp.push(81u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(0); comp.push(0u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(4); comp.push(85u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(-1); comp.push(80u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(4); comp.push(84u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(-1); comp.push(79u8); assert_eq!(&script[..], &comp[..]);
// forced scriptint
script = script.push_scriptint(4); comp.extend([1u8, 4].iter().cloned()); assert_eq!(&script[..], &comp[..]);
// big ints

8
src/blockdata/script_consensus.rs
View File

@ -2679,7 +2679,7 @@ impl Builder {
pub fn push_int(mut self, data: i64) -> Builder {
// We can special-case -1, 1-16
if data == -1 || (data >= 1 && data <= 16) {
self.0.push((data + opcodes::OP_TRUE as i64) as u8);
self.0.push((data - 1 + opcodes::OP_TRUE as i64) as u8);
self
}
// We can also special-case zero
@ -2867,10 +2867,10 @@ mod test {
assert_eq!(&script[..], &comp[..]);
// small ints
script = script.push_int(1); comp.push(82u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(1); comp.push(81u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(0); comp.push(0u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(4); comp.push(85u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(-1); comp.push(80u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(4); comp.push(84u8); assert_eq!(&script[..], &comp[..]);
script = script.push_int(-1); comp.push(79u8); assert_eq!(&script[..], &comp[..]);
// forced scriptint
script = script.push_scriptint(4); comp.extend([1u8, 4].iter().cloned()); assert_eq!(&script[..], &comp[..]);
// big ints