multi: update mempool error types.

.github/workflows/go.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Check out source
         uses: actions/checkout@v2
       - name: Install Linters
-        run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0"
+        run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.28.3"
       - name: Build
         env:
           GO111MODULE: "on"

blockchain/chain.go

@@ -1213,21 +1213,22 @@ func (b *BlockChain) forceHeadReorganization(formerBest chainhash.Hash, newBest
 	// We can't reorganize the chain unless our head block matches up with
 	// b.bestChain.
 	if !formerBestNode.hash.IsEqual(&formerBest) {
-		return ruleError(ErrForceReorgWrongChain, "tried to force reorg "+
-			"on wrong chain")
+		str := "tried to force reorg on wrong chain"
+		return ruleError(ErrForceReorgWrongChain, str)
 	}
 
 	// Child to reorganize to is missing.
 	newBestNode := b.index.LookupNode(&newBest)
 	if newBestNode == nil || newBestNode.parent != formerBestNode.parent {
-		return ruleError(ErrForceReorgMissingChild, "missing child of "+
-			"common parent for forced reorg")
+		str := "missing child of common parent for forced reorg"
+		return ruleError(ErrForceReorgMissingChild, str)
 	}
 
 	// Don't allow a reorganize to a known invalid chain.
 	newBestNodeStatus := b.index.NodeStatus(newBestNode)
 	if newBestNodeStatus.KnownInvalid() {
-		return ruleError(ErrKnownInvalidBlock, "block is known to be invalid")
+		str := "block is known to be invalid"
+		return ruleError(ErrKnownInvalidBlock, str)
 	}
 
 	// Reorganize the chain and flush any potential unsaved changes to the

blockchain/chain_test.go

@@ -150,8 +150,8 @@ func TestForceHeadReorg(t *testing.T) {
 	//
 	// rejectForceTipReorg forces the chain instance to reorganize the
 	// current tip of the main chain from the given block to the given
-	// block and expected it to be rejected with the provided error code.
-	rejectForceTipReorg := func(fromTipName, toTipName string, code ErrorCode) {
+	// block and expected it to be rejected with the provided error kind.
+	rejectForceTipReorg := func(fromTipName, toTipName string, errKind ErrorKind) {
 		from := g.BlockByName(fromTipName)
 		to := g.BlockByName(toTipName)
 		t.Logf("Testing forced reorg from %s (hash %s, height %d) "+
@@ -179,14 +179,13 @@ func TestForceHeadReorg(t *testing.T) {
 				from.BlockHash(), from.Header.Height, toTipName,
 				to.BlockHash(), to.Header.Height, err)
 		}
-		if rerr.ErrorCode != code {
+		if !errors.Is(rerr, errKind) {
 			t.Fatalf("forced header reorg from block %q (hash %s, "+
 				"height %d) to block %q (hash %s, height %d) "+
 				"does not have expected reject code -- got %v, "+
 				"want %v", fromTipName,
 				from.BlockHash(), from.Header.Height, toTipName,
-				to.BlockHash(), to.Header.Height, rerr.ErrorCode,
-				code)
+				to.BlockHash(), to.Header.Height, rerr, errKind)
 		}
 	}
 

blockchain/common_test.go

@@ -369,8 +369,8 @@ func (g *chaingenHarness) AcceptTipBlock() {
 }
 
 // RejectBlock expects the block associated with the given name in the harness
-// generator to be rejected with the provided error code.
-func (g *chaingenHarness) RejectBlock(blockName string, code ErrorCode) {
+// generator to be rejected with the provided error kind.
+func (g *chaingenHarness) RejectBlock(blockName string, errKind ErrorKind) {
 	g.t.Helper()
 
 	msgBlock := g.BlockByName(blockName)
@@ -393,19 +393,19 @@ func (g *chaingenHarness) RejectBlock(blockName string, code ErrorCode) {
 			"type -- got %T, want blockchain.RuleError", blockName,
 			block.Hash(), blockHeight, err)
 	}
-	if rerr.ErrorCode != code {
+	if !errors.Is(rerr, errKind) {
 		g.t.Fatalf("block %q (hash %s, height %d) does not have expected reject "+
 			"code -- got %v, want %v", blockName, block.Hash(), blockHeight,
-			rerr.ErrorCode, code)
+			rerr, errKind)
 	}
 }
 
 // RejectTipBlock expects the current tip block associated with the harness
 // generator to be rejected with the provided error code.
-func (g *chaingenHarness) RejectTipBlock(code ErrorCode) {
+func (g *chaingenHarness) RejectTipBlock(errKind ErrorKind) {
 	g.t.Helper()
 
-	g.RejectBlock(g.TipName(), code)
+	g.RejectBlock(g.TipName(), errKind)
 }
 
 // ExpectTip expects the provided block to be the current tip of the main chain