add targetGasLimit Ether units and test

danlipert · Sep 25, 2018 · 33b8b00 · 33b8b00
1 parent b24449d
commit 33b8b00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/modules/blockchain_process/blockchain.js b/lib/modules/blockchain_process/blockchain.js
@@ -1,5 +1,6 @@
 const async = require('async');
 const child_process = require('child_process');
+const web3 = require('web3');
 
 const fs = require('../../core/fs.js');
 const constants = require('../../constants.json');
@@ -52,7 +53,7 @@ var Blockchain = function(options) {
     wsOrigins: this.blockchainConfig.wsOrigins || false,
     wsApi: (this.blockchainConfig.wsApi || defaultWsApi),
     vmdebug: this.blockchainConfig.vmdebug || false,
-    targetGasLimit: this.blockchainConfig.targetGasLimit || false,
+    targetGasLimit: utils.getWeiBalanceFromString(this.blockchainConfig.targetGasLimit, web3) || false,
     syncMode: this.blockchainConfig.syncMode,
     syncmode: this.blockchainConfig.syncmode,
     verbosity: this.blockchainConfig.verbosity

diff --git a/test/blockchain.js b/test/blockchain.js
@@ -82,7 +82,7 @@ describe('embark.Blockchain', function () {
           wsOrigins: false,
           wsPort: 12346,
           wsRPC: true,
-          targetGasLimit: false,
+          targetGasLimit: "8 Mwei",
           syncMode: undefined,
           syncmode: undefined,
           verbosity: undefined,
@@ -95,7 +95,15 @@ describe('embark.Blockchain', function () {
           config.rpcPort += constants.blockchain.servicePortOnProxy;
         }
 
-        assert.deepEqual(blockchain.config, config);
+        try {
+            assert.deepEqual(blockchain.config, config);
+        } catch (e) {
+            // Verify Ether unit conversion to wei
+            assert(e instanceof assert.AssertionError);
+            assert.equal(e.actual['targetGasLimit'], '8000000');
+            assert.deepEqual(Object.assign({}, blockchain.config, {targetGasLimit: undefined}),
+                             Object.assign({}, config, {targetGasLimit: undefined}));
+        }
         done();
       });
     });