1 files changed, 23 insertions, 27 deletions

diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index 93e9e4134..8ca13412e 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -1,19 +1,25 @@
 const assert = require('assert')
-const ethUtil = require('ethereumjs-util')
-const BN = ethUtil.BN
+const Transaction = require('ethereumjs-tx')
+const BN = require('bn.js')
 
-const TxUtils = require('../../app/scripts/lib/tx-utils')
 
+const { hexToBn, bnToHex } = require('../../app/scripts/lib/util')
+const TxUtils = require('../../app/scripts/lib/tx-gas-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('chain Id', function() {
-    it('prepares a transaction with the provided chainId', function() {
+  describe('chain Id', function () {
+    it('prepares a transaction with the provided chainId', function () {
       const txParams = {
         to: '0x70ad465e0bab6504002ad58c744ed89c7da38524',
         from: '0x69ad465e0bab6504002ad58c744ed89c7da38525',
@@ -24,13 +30,13 @@ describe('txUtils', function() {
         nonce: '0x3',
         chainId: 42,
       }
-      const ethTx = txUtils.buildEthTxFromParams(txParams)
+      const ethTx = new Transaction(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() {
+  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)
@@ -41,20 +47,20 @@ 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() {
+
+    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 reccomend gas limit reccomended ceiling', function() {
+    it('buffers up to recommend gas limit recommended ceiling', function () {
       // naive estimatedGas: 0x16e360 (1.5 mil)
       const inputHex = '0x16e360'
       // dummy gas limit: 0x1e8480 (2 mil)
@@ -65,17 +71,7 @@ describe('txUtils', function() {
       // const inputBn = hexToBn(inputHex)
       // const outputBn = hexToBn(output)
       const expectedHex = bnToHex(ceilGasLimitBn)
-      assert.equal(output, expectedHex, 'returns the gas limit reccomended ceiling value')
+      assert.equal(output, expectedHex, 'returns the gas limit recommended ceiling value')
     })
   })
-})
-
-// util
-
-function hexToBn(inputHex) {
-  return new BN(ethUtil.stripHexPrefix(inputHex), 16)
-}
-
-function bnToHex(inputBn) {
-  return ethUtil.addHexPrefix(inputBn.toString(16))
-}
\ No newline at end of file
+})
\ No newline at end of file