Merge pull request #4116 from MetaMask/test-unit-ganache

Test - Move unit tests to ganache-core

3 files changed, 32 insertions, 16 deletions

diff --git a/test/stub/provider.js b/test/stub/provider.js
index e77db4e28..a1c70486d 100644
--- a/test/stub/provider.js
+++ b/test/stub/provider.js
@@ -1,14 +1,28 @@
 const JsonRpcEngine = require('json-rpc-engine')
 const scaffoldMiddleware = require('eth-json-rpc-middleware/scaffold')
-const TestBlockchain = require('eth-block-tracker/test/util/testBlockMiddleware')
+const providerAsMiddleware = require('eth-json-rpc-middleware/providerAsMiddleware')
+const GanacheCore = require('ganache-core')
 
 module.exports = {
   createEngineForTestData,
   providerFromEngine,
   scaffoldMiddleware,
   createTestProviderTools,
+  getTestSeed,
+  getTestAccounts,
 }
 
+function getTestSeed () {
+  return 'people carpet cluster attract ankle motor ozone mass dove original primary mask'
+}
+
+function getTestAccounts () {
+  return [
+    { address: '0x88bb7F89eB5e5b30D3e15a57C68DBe03C6aCCB21', key: Buffer.from('254A8D551474F35CCC816388B4ED4D20B945C96B7EB857A68064CB9E9FB2C092', 'hex') },
+    { address: '0x1fe9aAB565Be19629fF4e8541ca2102fb42D7724', key: Buffer.from('6BAB5A4F2A6911AF8EE2BD32C6C05F6643AC48EF6C939CDEAAAE6B1620805A9B', 'hex') },
+    { address: '0xbda5c89aa6bA1b352194291AD6822C92AbC87c7B', key: Buffer.from('9B11D7F833648F26CE94D544855558D7053ECD396E4F4563968C232C012879B0', 'hex') },
+  ]
+}
 
 function createEngineForTestData () {
   return new JsonRpcEngine()
@@ -21,11 +35,13 @@ function providerFromEngine (engine) {
 
 function createTestProviderTools (opts = {}) {
   const engine = createEngineForTestData()
-  const testBlockchain = new TestBlockchain()
   // handle provided hooks
   engine.push(scaffoldMiddleware(opts.scaffold || {}))
   // handle block tracker methods
-  engine.push(testBlockchain.createMiddleware())
+  engine.push(providerAsMiddleware(GanacheCore.provider({
+    mnemonic: getTestSeed(),
+  })))
+  // wrap in standard provider interface
   const provider = providerFromEngine(engine)
-  return { provider, engine, testBlockchain }
+  return { provider, engine }
 }
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 20d6f8573..0b5c7226a 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -6,16 +6,15 @@ const ObservableStore = require('obs-store')
 const sinon = require('sinon')
 const TransactionController = require('../../app/scripts/controllers/transactions')
 const TxGasUtils = require('../../app/scripts/controllers/transactions/tx-gas-utils')
-const { createTestProviderTools } = require('../stub/provider')
+const { createTestProviderTools, getTestAccounts } = require('../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
 const otherNetworkId = 36
-const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
 
 
 describe('Transaction Controller', function () {
-  let txController, provider, providerResultStub, testBlockchain
+  let txController, provider, providerResultStub, query, fromAccount
 
   beforeEach(function () {
     providerResultStub = {
@@ -24,9 +23,9 @@ describe('Transaction Controller', function () {
       // by default, all accounts are external accounts (not contracts)
       eth_getCode: '0x',
     }
-    const providerTools = createTestProviderTools({ scaffold: providerResultStub })
-    provider = providerTools.provider
-    testBlockchain = providerTools.testBlockchain
+    provider = createTestProviderTools({ scaffold: providerResultStub }).provider
+    query = new EthjsQuery(provider)
+    fromAccount = getTestAccounts()[0]
 
     txController = new TransactionController({
       provider,
@@ -34,7 +33,7 @@ describe('Transaction Controller', function () {
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
       signTransaction: (ethTx) => new Promise((resolve) => {
-        ethTx.sign(privKey)
+        ethTx.sign(fromAccount.key)
         resolve()
       }),
     })
@@ -298,12 +297,12 @@ describe('Transaction Controller', function () {
 
   describe('#updateAndApproveTransaction', function () {
     let txMeta
-    beforeEach(function () {
+    beforeEach(() => {
       txMeta = {
         id: 1,
         status: 'unapproved',
         txParams: {
-          from: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
+          from: fromAccount.address,
           to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
           gasPrice: '0x77359400',
           gas: '0x7b0d',
@@ -312,11 +311,12 @@ describe('Transaction Controller', function () {
         metamaskNetworkId: currentNetworkId,
       }
     })
-    it('should update and approve transactions', function () {
+    it('should update and approve transactions', async () => {
       txController.txStateManager.addTx(txMeta)
-      txController.updateAndApproveTransaction(txMeta)
+      const approvalPromise = txController.updateAndApproveTransaction(txMeta)
       const tx = txController.txStateManager.getTx(1)
       assert.equal(tx.status, 'approved')
+      await approvalPromise
     })
   })
 
diff --git a/test/unit/tx-utils-test.js b/test/unit/tx-utils-test.js
index ae7afd285..be16225ba 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/tx-utils-test.js
@@ -95,4 +95,4 @@ describe('txUtils', function () {
       txUtils.validateFrom(txParams)
       })
   })
-})
\ No newline at end of file
+})