aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit/app/controllers/transactions/tx-controller-test.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
commit28c509914bf09850dd9aaef52b212f6271633e93 (patch)
tree049373cf51ae16580a5f18dd29e195e68d4f7b53 /test/unit/app/controllers/transactions/tx-controller-test.js
parent94a4f99115cf549a3014d29d828e7a432bf36a62 (diff)
parentf6de948e42ae633d40aef72595a01caa622a280d (diff)
downloadtangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.gz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.bz2
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.lz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.xz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.zst
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.zip
Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896
Diffstat (limited to 'test/unit/app/controllers/transactions/tx-controller-test.js')
-rw-r--r--test/unit/app/controllers/transactions/tx-controller-test.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
index 4328f38e5..26dc7b656 100644
--- a/test/unit/app/controllers/transactions/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -1,20 +1,17 @@
const assert = require('assert')
const ethUtil = require('ethereumjs-util')
const EthTx = require('ethereumjs-tx')
-const EthjsQuery = require('ethjs-query')
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, getTestAccounts } = require('../../../../stub/provider')
const noop = () => true
const currentNetworkId = 42
-const otherNetworkId = 36
describe('Transaction Controller', function () {
- let txController, provider, providerResultStub, query, fromAccount
+ let txController, provider, providerResultStub, fromAccount
beforeEach(function () {
providerResultStub = {
@@ -24,7 +21,6 @@ describe('Transaction Controller', function () {
eth_getCode: '0x',
}
provider = createTestProviderTools({ scaffold: providerResultStub }).provider
- query = new EthjsQuery(provider)
fromAccount = getTestAccounts()[0]
txController = new TransactionController({
@@ -395,7 +391,7 @@ describe('Transaction Controller', function () {
describe('#retryTransaction', function () {
it('should create a new txMeta with the same txParams as the original one', function (done) {
- let txParams = {
+ const txParams = {
nonce: '0x00',
from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',