blockchain: check errors and remove ineffectual assignments.

blockchain/chain_test.go

@@ -39,6 +39,9 @@ func TestBlockchainFunctions(t *testing.T) {
 	// Load up the rest of the blocks up to HEAD~1.
 	filename := filepath.Join("testdata/", "blocks0to168.bz2")
 	fi, err := os.Open(filename)
+	if err != nil {
+		t.Errorf("Unable to open %s: %v", filename, err)
+	}
 	bcStream := bzip2.NewReader(fi)
 	defer fi.Close()
 

blockchain/fullblocktests/generate.go

@@ -1045,7 +1045,7 @@ func Generate() (tests [][]TestInstance, err error) {
 	//
 	// OP_CHECKMULTISIG counts for 20 sigops.
 	tooManySigOps = repeatOpcode(txscript.OP_CHECKMULTISIG, maxBlockSigOps/20)
-	tooManySigOps = append(manySigOps, txscript.OP_CHECKSIG)
+	tooManySigOps = append(tooManySigOps, txscript.OP_CHECKSIG)
 	g.NextBlock("b38", outs[10], ticketOuts[10], replaceSpendScript(tooManySigOps))
 	g.AssertTipBlockSigOpsCount(maxBlockSigOps + 1)
 	rejected(blockchain.ErrTooManySigOps)
@@ -1067,7 +1067,7 @@ func Generate() (tests [][]TestInstance, err error) {
 	//                \-> b40(11)
 	//
 	tooManySigOps = repeatOpcode(txscript.OP_CHECKMULTISIGVERIFY, maxBlockSigOps/20)
-	tooManySigOps = append(manySigOps, txscript.OP_CHECKSIG)
+	tooManySigOps = append(tooManySigOps, txscript.OP_CHECKSIG)
 	g.NextBlock("b40", outs[11], ticketOuts[11], replaceSpendScript(tooManySigOps))
 	g.AssertTipBlockSigOpsCount(maxBlockSigOps + 1)
 	rejected(blockchain.ErrTooManySigOps)

blockchain/reorganization_test.go

@@ -40,6 +40,9 @@ func reorgTestLong(t *testing.T) {
 	// Load up the rest of the blocks up to HEAD.
 	filename := filepath.Join("testdata/", "reorgto179.bz2")
 	fi, err := os.Open(filename)
+	if err != nil {
+		t.Errorf("Unable to open %s: %v", filename, err)
+	}
 	bcStream := bzip2.NewReader(fi)
 	defer fi.Close()
 
@@ -75,6 +78,9 @@ func reorgTestLong(t *testing.T) {
 	// Load up the rest of the blocks up to HEAD.
 	filename = filepath.Join("testdata/", "reorgto180.bz2")
 	fi, err = os.Open(filename)
+	if err != nil {
+		t.Errorf("Unable to open %s: %v", filename, err)
+	}
 	bcStream = bzip2.NewReader(fi)
 	defer fi.Close()
 
@@ -149,6 +155,9 @@ func reorgTestShort(t *testing.T) {
 	// Load up the rest of the blocks up to HEAD.
 	filename := filepath.Join("testdata/", "reorgto179.bz2")
 	fi, err := os.Open(filename)
+	if err != nil {
+		t.Errorf("Unable to open %s: %v", filename, err)
+	}
 	bcStream := bzip2.NewReader(fi)
 	defer fi.Close()
 
@@ -170,6 +179,9 @@ func reorgTestShort(t *testing.T) {
 	// Load up the rest of the blocks up to HEAD.
 	filename = filepath.Join("testdata/", "reorgto180.bz2")
 	fi, err = os.Open(filename)
+	if err != nil {
+		t.Errorf("Unable to open %s: %v", filename, err)
+	}
 	bcStream = bzip2.NewReader(fi)
 	defer fi.Close()
 

blockchain/stake/staketx.go

@@ -410,6 +410,9 @@ func TxSSGenStakeOutputInfo(tx *wire.MsgTx, params *chaincfg.Params) ([]bool,
 					"ssgen tagged output in idx %v", idx)
 			}
 			subClass, err := txscript.GetStakeOutSubclass(out.PkScript)
+			if err != nil {
+				return nil, nil, nil, err
+			}
 			if !(subClass == txscript.PubKeyHashTy ||
 				subClass == txscript.ScriptHashTy) {
 				return nil, nil, nil, fmt.Errorf("bad script type")
@@ -494,6 +497,9 @@ func TxSSRtxStakeOutputInfo(tx *wire.MsgTx, params *chaincfg.Params) ([]bool,
 				"ssrtx tagged output in idx %v", idx)
 		}
 		subClass, err := txscript.GetStakeOutSubclass(out.PkScript)
+		if err != nil {
+			return nil, nil, nil, err
+		}
 		if !(subClass == txscript.PubKeyHashTy ||
 			subClass == txscript.ScriptHashTy) {
 			return nil, nil, nil, fmt.Errorf("bad script type")

blockchain/stakeversion_test.go

@@ -359,7 +359,6 @@ func TestCalcStakeVersionCorners(t *testing.T) {
 		bc.bestNode = currentNode
 
 	}
-	height += runCount
 
 	if !bc.isStakeMajorityVersion(0, currentNode) {
 		t.Fatalf("invalid StakeVersion expected 0 -> true")

blockchain/subsidy.go

@@ -250,6 +250,9 @@ func BlockOneCoinbasePaysTokens(tx *dcrutil.Tx,
 		// There should only be one address.
 		_, addrs, _, err :=
 			txscript.ExtractPkScriptAddrs(txout.Version, txout.PkScript, params)
+		if err != nil {
+			return ruleError(ErrBlockOneOutputs, err.Error())
+		}
 		if len(addrs) != 1 {
 			errStr := fmt.Sprintf("too many addresses in output")
 			return ruleError(ErrBlockOneOutputs, errStr)