grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename transactions message_hash -> hash

Browse Source
This commit is contained in:
debris 2016-02-05 13:29:07 +01:00
parent 1d209d909e
commit 7db500c38d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/transaction.rs
View File

@ -93,7 +93,7 @@ impl FromJson for SignedTransaction {
impl Transaction { impl Transaction {
/// The message hash of the transaction. /// The message hash of the transaction.
pub fn message_hash(&self) -> H256 { pub fn hash(&self) -> H256 {
let mut stream = RlpStream::new(); let mut stream = RlpStream::new();
self.rlp_append_unsigned_transaction(&mut stream); self.rlp_append_unsigned_transaction(&mut stream);
stream.out().sha3() stream.out().sha3()
@ -101,7 +101,7 @@ impl Transaction {
/// Signs the transaction as coming from `sender`. /// Signs the transaction as coming from `sender`.
pub fn sign(self, secret: &Secret) -> SignedTransaction { pub fn sign(self, secret: &Secret) -> SignedTransaction {
let sig = ec::sign(secret, &self.message_hash()); let sig = ec::sign(secret, &self.hash());
let (r, s, v) = sig.unwrap().to_rsv(); let (r, s, v) = sig.unwrap().to_rsv();
SignedTransaction { SignedTransaction {
transaction: self, transaction: self,
@ -245,7 +245,7 @@ impl SignedTransaction {
match &mut *sender { match &mut *sender {
&mut Some(ref h) => Ok(h.clone()), &mut Some(ref h) => Ok(h.clone()),
sender @ &mut None => { sender @ &mut None => {
*sender = Some(From::from(try!(ec::recover(&self.signature(), &self.message_hash())).sha3())); *sender = Some(From::from(try!(ec::recover(&self.signature(), &self.transaction.hash())).sha3()));
Ok(sender.as_ref().unwrap().clone()) Ok(sender.as_ref().unwrap().clone())
} }
} }