Merge pull request #122 from LiskHQ/121_error-thorw-return

verifyMessageWithPublicKey should rather “throw” errors then “return”…
LiskArchive · May 10, 2017 · 4af32fe · 4af32fe
2 parents bebb4f5 + 674c8a2
commit 4af32fe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/dist/lisk-js.js b/dist/lisk-js.js
@@ -2040,7 +2040,9 @@ function verifyMessageWithPublicKey (signedMessage, publicKey) {
 	var signedMessageBytes = convert.hexToBuffer(signedMessage);
 	var publicKeyBytes = convert.hexToBuffer(publicKey);
 
-	if (publicKeyBytes.length !== 32) return { message: 'Invalid publicKey, expected 32-byte publicKey' };
+	if (publicKeyBytes.length !== 32) {
+		throw new Error('Invalid publicKey, expected 32-byte publicKey');
+	}
 
 	// Give appropriate error messages from crypto_sign_open
 	var openSignature = naclInstance.crypto_sign_open(signedMessageBytes, publicKeyBytes);
@@ -2049,7 +2051,7 @@ function verifyMessageWithPublicKey (signedMessage, publicKey) {
 		// Returns original message
 		return naclInstance.decode_utf8(openSignature);
 	} else {
-		return { message: 'Invalid signature publicKey combination, cannot verify message' };
+		throw new Error('Invalid signature publicKey combination, cannot verify message');
 	}
 }
 

diff --git a/dist/lisk-js.min.js b/dist/lisk-js.min.js
diff --git a/lib/transactions/crypto/sign.js b/lib/transactions/crypto/sign.js
@@ -65,7 +65,9 @@ function verifyMessageWithPublicKey (signedMessage, publicKey) {
 	var signedMessageBytes = convert.hexToBuffer(signedMessage);
 	var publicKeyBytes = convert.hexToBuffer(publicKey);
 
-	if (publicKeyBytes.length !== 32) return { message: 'Invalid publicKey, expected 32-byte publicKey' };
+	if (publicKeyBytes.length !== 32) {
+		throw new Error('Invalid publicKey, expected 32-byte publicKey');
+	}
 
 	// Give appropriate error messages from crypto_sign_open
 	var openSignature = naclInstance.crypto_sign_open(signedMessageBytes, publicKeyBytes);
@@ -74,7 +76,7 @@ function verifyMessageWithPublicKey (signedMessage, publicKey) {
 		// Returns original message
 		return naclInstance.decode_utf8(openSignature);
 	} else {
-		return { message: 'Invalid signature publicKey combination, cannot verify message' };
+		throw new Error('Invalid signature publicKey combination, cannot verify message');
 	}
 }
 

diff --git a/test/transactions/crypto/index.js b/test/transactions/crypto/index.js
@@ -141,16 +141,16 @@ describe('crypto/index.js', function () {
 
 		it('should detect invalid publicKeys', function () {
 			var invalidPublicKey = keypair.publicKey + 'ERROR';
-			var invalidVerifyMessage = newcrypto.verifyMessageWithPublicKey(signedMessage, invalidPublicKey);
-
-			(invalidVerifyMessage.message).should.be.equal('Invalid publicKey, expected 32-byte publicKey');
+			expect(function () {
+				newcrypto.verifyMessageWithPublicKey(signedMessage, invalidPublicKey);
+			}).to.throw(Error, 'Invalid publicKey, expected 32-byte publicKey');
 		});
 
 		it('should detect not verifiable signature', function () {
 			var signedMessage = newcrypto.signMessageWithSecret(message, secret) + 'ERROR';
-			var invalidVerifyMessage = newcrypto.verifyMessageWithPublicKey(signedMessage, publicKey);
-
-			(invalidVerifyMessage.message).should.be.equal('Invalid signature publicKey combination, cannot verify message');
+			expect(function () {
+				newcrypto.verifyMessageWithPublicKey(signedMessage, publicKey);
+			}).to.throw(Error, 'Invalid signature publicKey combination, cannot verify message');
 		});
 	});