1 files changed, 48 insertions, 21 deletions

diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index e57b25e83..7ace1f587 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -5,17 +5,38 @@ const BN = ethUtil.BN
 const TxUtils = require('../../app/scripts/lib/tx-utils')
 
 
-describe('txUtils', function() {
+describe('txUtils', function () {
   let txUtils
 
-  before(function() {
-    txUtils = new TxUtils()
+  before(function () {
+    txUtils = new TxUtils(new Proxy({}, {
+      get: (obj, name) => {
+        return () => {}
+      },
+    }))
   })
 
-  describe('addGasBuffer', function() {
-    it('multiplies by 1.5, when within block gas limit', function() {
-      // naive estimatedGas: 0x123fad (~1.2 mil)
-      const inputHex = '0x123fad'
+  describe('chain Id', function () {
+    it('prepares a transaction with the provided chainId', function () {
+      const txParams = {
+        to: '0x70ad465e0bab6504002ad58c744ed89c7da38524',
+        from: '0x69ad465e0bab6504002ad58c744ed89c7da38525',
+        value: '0x0',
+        gas: '0x7b0c',
+        gasPrice: '0x199c82cc00',
+        data: '0x',
+        nonce: '0x3',
+        chainId: 42,
+      }
+      const ethTx = txUtils.buildEthTxFromParams(txParams)
+      assert.equal(ethTx.getChainId(), 42, 'chainId is set from tx params')
+    })
+  })
+
+  describe('addGasBuffer', function () {
+    it('multiplies by 1.5, when within block gas limit', function () {
+      // naive estimatedGas: 0x16e360 (1.5 mil)
+      const inputHex = '0x16e360'
       // dummy gas limit: 0x3d4c52 (4 mil)
       const blockGasLimitHex = '0x3d4c52'
       const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
@@ -24,35 +45,41 @@ describe('txUtils', function() {
       const expectedBn = inputBn.muln(1.5)
       assert(outputBn.eq(expectedBn), 'returns 1.5 the input value')
     })
-    
-    it('uses original estimatedGas, when above block gas limit', function() {
-      // naive estimatedGas: 0x123fad (~1.2 mil)
-      const inputHex = '0x123fad'
+
+    it('uses original estimatedGas, when above block gas limit', function () {
+      // naive estimatedGas: 0x16e360 (1.5 mil)
+      const inputHex = '0x16e360'
       // dummy gas limit: 0x0f4240 (1 mil)
       const blockGasLimitHex = '0x0f4240'
       const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
-      const inputBn = hexToBn(inputHex)
+      // const inputBn = hexToBn(inputHex)
       const outputBn = hexToBn(output)
       const expectedBn = hexToBn(inputHex)
       assert(outputBn.eq(expectedBn), 'returns the original estimatedGas value')
     })
 
-    it('buffers up to block gas limit', function() {
-      // naive estimatedGas: 0x123fad (~1.2 mil)
-      const inputHex = '0x1e8480'
+    it('buffers up to reccomend gas limit reccomended ceiling', function () {
+      // naive estimatedGas: 0x16e360 (1.5 mil)
+      const inputHex = '0x16e360'
       // dummy gas limit: 0x1e8480 (2 mil)
       const blockGasLimitHex = '0x1e8480'
+      const blockGasLimitBn = hexToBn(blockGasLimitHex)
+      const ceilGasLimitBn = blockGasLimitBn.muln(0.9)
       const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
-      const inputBn = hexToBn(inputHex)
-      const outputBn = hexToBn(output)
-      const expectedBn = hexToBn(blockGasLimitHex)
-      assert(outputBn.eq(expectedBn), 'returns the block gas limit value')
+      // const inputBn = hexToBn(inputHex)
+      // const outputBn = hexToBn(output)
+      const expectedHex = bnToHex(ceilGasLimitBn)
+      assert.equal(output, expectedHex, 'returns the gas limit reccomended ceiling value')
     })
   })
 })
 
 // util
 
-function hexToBn(inputHex) {
+function hexToBn (inputHex) {
   return new BN(ethUtil.stripHexPrefix(inputHex), 16)
-}
\ No newline at end of file
+}
+
+function bnToHex (inputBn) {
+  return ethUtil.addHexPrefix(inputBn.toString(16))
+}