Updated forkedBlockchain block discovery logic with regex (#553)

* Updated forkedBlockchain block discovery logic with regex * use exec instead of match for xcode9.2 support * Parse blocknumber * regex use group * Attempt xcode friendly regex * Update code base on davidmurdoch review
trufflesuite · Apr 8, 2020 · 25de0e2 · 25de0e2
1 parent d1cb531
commit 25de0e2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/utils/forkedblockchain.js b/lib/utils/forkedblockchain.js
@@ -18,6 +18,7 @@ inherits(ForkedBlockchain, BlockchainDouble);
 const httpReg = /^https?:/i;
 const protocolReg = /^[A-Za-z][A-Za-z0-9+\-.]*:/;
 const validProtocolReg = /^(?:http|ws)s?:/i;
+const blockNumberReg = /@([0-9]+)$/;
 
 function ForkedBlockchain(options) {
   this.options = options || {};
@@ -29,10 +30,11 @@ function ForkedBlockchain(options) {
   this.forkVersion = null;
 
   if (typeof options.fork === "string") {
-    if (options.fork.indexOf("@") >= 0) {
-      const split = options.fork.split("@", 2);
-      options.fork = split[0];
-      options.fork_block_number = parseInt(split[1]);
+    const blockNumber = blockNumberReg.exec(options.fork);
+
+    if (blockNumber) {
+      options.fork = options.fork.slice(0, blockNumber.index);
+      options.fork_block_number = parseInt(blockNumber[1], 10);
     }
 
     let fork;