From 15e4643bfbf93bd21d49788b02eef01b9cae7a28 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 10 Mar 2017 10:28:16 +0100 Subject: [PATCH] changed isChecksumAddress to checkAddressChecksum --- packages/web3-utils/src/index.js | 12 ++++++------ test/utils.isChecksumAddress.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/web3-utils/src/index.js b/packages/web3-utils/src/index.js index b0f9fc7..48e1621 100644 --- a/packages/web3-utils/src/index.js +++ b/packages/web3-utils/src/index.js @@ -450,7 +450,7 @@ var isAddress = function (address) { return true; // Otherwise check each case } else { - return isChecksumAddress(address); + return checkAddressChecksum(address); } }; @@ -459,11 +459,11 @@ var isAddress = function (address) { /** * Checks if the given string is a checksummed address * - * @method isChecksumAddress + * @method checkAddressChecksum * @param {String} address the given HEX adress * @return {Boolean} */ -var isChecksumAddress = function (address) { +var checkAddressChecksum = function (address) { // Check each case address = address.replace('0x',''); var addressHash = sha3(address.toLowerCase()).replace('0x',''); @@ -562,6 +562,9 @@ module.exports = { padLeft: padLeft, padRight: padRight, toAddress: toAddress, + isAddress: isAddress, + checkAddressChecksum: checkAddressChecksum, + toChecksumAddress: toChecksumAddress, toHex: toHex, toBN: toBN, toNumberString: toNumberString, @@ -577,9 +580,6 @@ module.exports = { fromWei: fromWei, isBN: isBN, isBigNumber: isBigNumber, - isAddress: isAddress, - isChecksumAddress: isChecksumAddress, - toChecksumAddress: toChecksumAddress, sha3: sha3 }; diff --git a/test/utils.isChecksumAddress.js b/test/utils.isChecksumAddress.js index 2745e18..c486597 100644 --- a/test/utils.isChecksumAddress.js +++ b/test/utils.isChecksumAddress.js @@ -17,10 +17,10 @@ var tests = [ ]; describe('lib/utils/utils', function () { - describe('isChecksumAddress', function () { + describe('checkAddressChecksum', function () { tests.forEach(function (test) { it('shoud test if address ' + test.value + ' passes checksum: ' + test.is, function () { - assert.equal(utils.isChecksumAddress(test.value), test.is); + assert.equal(utils.checkAddressChecksum(test.value), test.is); }); }); });