Minor fixes

sign.go

@@ -19,18 +19,26 @@ func SignMessage(privateKey string, message string) (string, error) {
 	}
 
 	var buf bytes.Buffer
-	wire.WriteVarString(&buf, 0, hBSV)
-	wire.WriteVarString(&buf, 0, message)
+	var err error
+	if err = wire.WriteVarString(&buf, 0, hBSV); err != nil {
+		return "", err
+	}
+	if err = wire.WriteVarString(&buf, 0, message); err != nil {
+		return "", err
+	}
 
+	// Create the hash
 	messageHash := chainhash.DoubleHashB(buf.Bytes())
 
-	ecdsaPrivateKey, err := PrivateKeyFromString(privateKey)
-	if err != nil {
+	// Get the private key
+	var ecdsaPrivateKey *bsvec.PrivateKey
+	if ecdsaPrivateKey, err = PrivateKeyFromString(privateKey); err != nil {
 		return "", err
 	}
+
+	// Sign
 	var sigBytes []byte
-	sigBytes, err = bsvec.SignCompact(bsvec.S256(), ecdsaPrivateKey, messageHash, true)
-	if err != nil {
+	if sigBytes, err = bsvec.SignCompact(bsvec.S256(), ecdsaPrivateKey, messageHash, true); err != nil {
 		return "", err
 	}
 	return base64.StdEncoding.EncodeToString(sigBytes), nil

verify.go

@@ -33,24 +33,31 @@ func VerifyMessage(address, sig, data string) error {
 	// Validate the signature - this just shows that it was valid at all.
 	// we will compare it with the key next.
 	var buf bytes.Buffer
-	wire.WriteVarString(&buf, 0, hBSV)
-	wire.WriteVarString(&buf, 0, data)
+	if err = wire.WriteVarString(&buf, 0, hBSV); err != nil {
+		return err
+	}
+	if err = wire.WriteVarString(&buf, 0, data); err != nil {
+		return err
+	}
+
+	// Create the hash
 	expectedMessageHash := chainhash.DoubleHashB(buf.Bytes())
 
-	pk, wasCompressed, err := bsvec.RecoverCompact(bsvec.S256(), decodedSig, expectedMessageHash)
-	if err != nil {
+	var publicKey *bsvec.PublicKey
+	var wasCompressed bool
+	if publicKey, wasCompressed, err = bsvec.RecoverCompact(bsvec.S256(), decodedSig, expectedMessageHash); err != nil {
 		return err
 	}
 
 	// Reconstruct the pubkey hash.
 	var serializedPK []byte
 	if wasCompressed {
-		serializedPK = pk.SerializeCompressed()
+		serializedPK = publicKey.SerializeCompressed()
 	} else {
-		serializedPK = pk.SerializeUncompressed()
+		serializedPK = publicKey.SerializeUncompressed()
 	}
-	bsvecAddress, err := bsvutil.NewAddressPubKey(serializedPK, &chaincfg.MainNetParams)
-	if err != nil {
+	var bsvecAddress *bsvutil.AddressPubKey
+	if bsvecAddress, err = bsvutil.NewAddressPubKey(serializedPK, &chaincfg.MainNetParams); err != nil {
 		return err
 	}
 

verify_test.go

@@ -227,10 +227,7 @@ func TestVerifyMessageSigRecoverFailed(t *testing.T) {
 		exp.X.SetHex(vs[i][4])
 		exp.Y.SetHex(vs[i][5])
 
-		var success bool
-		success = secp256k1.RecoverPublicKey(sig.R.Bytes(), sig.S.Bytes(), msg.Bytes(), int(rid), &pubkey)
-
-		if success {
+		if secp256k1.RecoverPublicKey(sig.R.Bytes(), sig.S.Bytes(), msg.Bytes(), int(rid), &pubkey) {
 			t.Fatalf("sigRecover should have failed")
 		}
 	}