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

Rename Transaction::scripthash to Transaction::signature_hash 

Yes, this is a major release because I misspelled the name of a function :)
This commit is contained in:
Andrew Poelstra 2016-06-13 21:25:47 +00:00
parent 38b2cacf35
commit 50b3e90912
2 changed files with 5 additions and 5 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.6.0"
version = "0.7.0"
authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
license = "CC0-1.0"
homepage = "https://github.com/apoelstra/rust-bitcoin/"

8
src/blockdata/transaction.rs
View File

@ -112,7 +112,7 @@ impl Transaction {
cloned_tx.bitcoin_hash()
}
/// Computes a scripthash for a given input index with a given sighash flag.
/// Computes a signature hash for a given input index with a given sighash flag.
/// To actually produce a scriptSig, this hash needs to be run through an
/// ECDSA signer, the SigHashType appended to the resulting sig, and a
/// script written around this, but this is the general (and hard) part.
@ -125,7 +125,7 @@ impl Transaction {
/// # Panics
/// Panics if `input_index` is greater than or equal to `self.input.len()`
///
pub fn scripthash(&self, input_index: usize, script_pubkey: &Script, sighash_u32: u32) -> Sha256dHash {
pub fn signature_hash(&self, input_index: usize, script_pubkey: &Script, sighash_u32: u32) -> Sha256dHash {
assert!(input_index < self.input.len()); // Panic on OOB
let (sighash, anyone_can_pay) = SigHashType::from_u32(sighash_u32).split_anyonecanpay_flag();
@ -229,7 +229,7 @@ impl SigHashType {
}
}
/// Reads a 4-byte uint32 as a scripthash
/// Reads a 4-byte uint32 as a sighash type
pub fn from_u32(n: u32) -> SigHashType {
match n & 0x9f {
// "real" sighashes
@ -323,7 +323,7 @@ mod tests {
raw_expected.reverse();
let expected_result = Sha256dHash::from(&raw_expected[..]);
let actual_result = tx.scripthash(input_index, &script, hash_type as u32);
let actual_result = tx.signature_hash(input_index, &script, hash_type as u32);
println!("{} outputs {} inputs index {} sighash {:?}", tx.output.len(), tx.input.len(), input_index, sighash);
assert_eq!(actual_result, expected_result);
}