txscript: Remove excessive error check.

realevilco · Feb 9, 2015 · 45dfa1a · 45dfa1a
1 parent abf1b23
commit 45dfa1a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/txscript/script.go b/txscript/script.go
@@ -1501,10 +1501,6 @@ func SignTxOutput(chainParams *chaincfg.Params, tx *wire.MsgTx, idx int,
 	// Merge scripts. with any previous data, if any.
 	mergedScript := mergeScripts(chainParams, tx, idx, pkScript, class,
 		addresses, nrequired, sigScript, previousScript)
-	if err != nil {
-		return nil, err
-	}
-
 	return mergedScript, nil
 }