From 04d88d01ec160ec4936336e37a31f6756298dba0 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Mon, 29 Jul 2013 19:50:00 -0500 Subject: [PATCH] Clarify mismatched merkle root error message. --- validate.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/validate.go b/validate.go index 67f110c05..758a60363 100644 --- a/validate.go +++ b/validate.go @@ -452,8 +452,9 @@ func (b *BlockChain) checkBlockSanity(block *btcutil.Block) error { merkles := BuildMerkleTreeStore(block) calculatedMerkleRoot := merkles[len(merkles)-1] if !header.MerkleRoot.IsEqual(calculatedMerkleRoot) { - str := fmt.Sprintf("block merkle root is invalid - got %v, "+ - "want %v", calculatedMerkleRoot, header.MerkleRoot) + str := fmt.Sprintf("block merkle root is invalid - block "+ + "header indicates %v, but calculated value is %v", + header.MerkleRoot, calculatedMerkleRoot) return RuleError(str) }