changes not related to this PR reverted in inputDefaultBlockNumberFor…

…matter and tests fixed
web3 · Nov 22, 2019 · e826821 · e826821
1 parent a4aed06
commit e826821
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/web3-core-helpers/src/formatters.js b/packages/web3-core-helpers/src/formatters.js
@@ -98,16 +98,16 @@ var isPredefinedBlockNumber = function (blockNumber) {
  * @returns {String}
  */
 var inputDefaultBlockNumberFormatter = function (blockNumber) {
-    if (blockNumber === 'genesis') {
-        return 'earliest';
-    }
+    if (this && (blockNumber === undefined || blockNumber === null)) {
+        if (isPredefinedBlockNumber(this.defaultBlock)) {
+            return this.defaultBlock;
+        }
 
-    if (isPredefinedBlockNumber(blockNumber)) {
-        return blockNumber;
+        return utils.numberToHex(this.defaultBlock);
     }
 
-    if (this && (blockNumber === undefined || blockNumber === null)) {
-        return utils.numberToHex(this.defaultBlock);
+    if (blockNumber === 'genesis' || blockNumber === 'earliest') {
+        return '0x0';
     }
 
     return inputBlockNumberFormatter(blockNumber);