Update for recent wire API hash error changes.

nullcanon · Apr 17, 2015 · 9556412 · 9556412
1 parent e330838
commit 9556412
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/block.go b/block.go
@@ -76,11 +76,8 @@ func (b *Block) Sha() *wire.ShaHash {
 		return b.blockSha
 	}
 
-	// Generate the block hash.  Ignore the error since BlockSha can't
-	// currently fail.
-	sha, _ := b.msgBlock.BlockSha()
-
 	// Cache the block hash and return it.
+	sha := b.msgBlock.BlockSha()
 	b.blockSha = &sha
 	return &sha
 }

diff --git a/tx.go b/tx.go
@@ -41,11 +41,8 @@ func (t *Tx) Sha() *wire.ShaHash {
 		return t.txSha
 	}
 
-	// Generate the transaction hash.  Ignore the error since TxSha can't
-	// currently fail.
-	sha, _ := t.msgTx.TxSha()
-
 	// Cache the hash and return it.
+	sha := t.msgTx.TxSha()
 	t.txSha = &sha
 	return &sha
 }