poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1601 from MetaMask/ChainIdErrorTest 

Chain id error test
This commit is contained in:
Frankie 2017-06-12 19:34:43 -07:00 committed by GitHub
parent bbe0c73dca c0f07844af
commit eccb8b8f80
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/transactions.js
View File

@ -212,7 +212,7 @@ module.exports = class TransactionController extends EventEmitter {
getChainId () {
const networkState = this.networkStore.getState()
const getChainId = parseInt(networkState.network)
const getChainId = parseInt(networkState)
if (Number.isNaN(getChainId)) {
return 0
} else {

5
test/unit/tx-controller-test.js
View File

@ -311,12 +311,13 @@ describe('Transaction Controller', function () {
})
describe('#sign replay-protected tx', function () {
it('prepares a tx with the chainId set', function () {
it('prepares a tx with the chainId set', function (done) {
txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
txController.signTransaction('1', (err, rawTx) => {
if (err) return assert.fail('it should not fail')
if (err) return done('it should not fail')
const ethTx = new EthTx(ethUtil.toBuffer(rawTx))
assert.equal(ethTx.getChainId(), currentNetworkId)
done()
})
})
})