Remove error return from Block.Sha function.
This commit remove the error return from the Block.Sha function since it can never fail and ends up causing a lot of unneeded error checking throughout the code base.
This commit is contained in:
parent
ff58d6571d
commit
e330838900
2 changed files with 4 additions and 8 deletions
6
block.go
6
block.go
|
@ -70,10 +70,10 @@ func (b *Block) Bytes() ([]byte, error) {
|
|||
// Sha returns the block identifier hash for the Block. This is equivalent to
|
||||
// calling BlockSha on the underlying wire.MsgBlock, however it caches the
|
||||
// result so subsequent calls are more efficient.
|
||||
func (b *Block) Sha() (*wire.ShaHash, error) {
|
||||
func (b *Block) Sha() *wire.ShaHash {
|
||||
// Return the cached block hash if it has already been generated.
|
||||
if b.blockSha != nil {
|
||||
return b.blockSha, nil
|
||||
return b.blockSha
|
||||
}
|
||||
|
||||
// Generate the block hash. Ignore the error since BlockSha can't
|
||||
|
@ -82,7 +82,7 @@ func (b *Block) Sha() (*wire.ShaHash, error) {
|
|||
|
||||
// Cache the block hash and return it.
|
||||
b.blockSha = &sha
|
||||
return &sha, nil
|
||||
return &sha
|
||||
}
|
||||
|
||||
// Tx returns a wrapped transaction (btcutil.Tx) for the transaction at the
|
||||
|
|
|
@ -43,11 +43,7 @@ func TestBlock(t *testing.T) {
|
|||
|
||||
// Request the sha multiple times to test generation and caching.
|
||||
for i := 0; i < 2; i++ {
|
||||
sha, err := b.Sha()
|
||||
if err != nil {
|
||||
t.Errorf("Sha: %v", err)
|
||||
continue
|
||||
}
|
||||
sha := b.Sha()
|
||||
if !sha.IsEqual(wantSha) {
|
||||
t.Errorf("Sha #%d mismatched sha - got %v, want %v", i,
|
||||
sha, wantSha)
|
||||
|
|
Loading…
Reference in a new issue