aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/integration/lib/idStore-migrator-test.js10
-rw-r--r--test/unit/actions/tx_test.js12
-rw-r--r--test/unit/keyrings/hd-test.js127
-rw-r--r--test/unit/keyrings/simple-test.js149
-rw-r--r--test/unit/personal-message-manager-test.js89
5 files changed, 98 insertions, 289 deletions
diff --git a/test/integration/lib/idStore-migrator-test.js b/test/integration/lib/idStore-migrator-test.js
index f2a437a7c..290216ae8 100644
--- a/test/integration/lib/idStore-migrator-test.js
+++ b/test/integration/lib/idStore-migrator-test.js
@@ -1,8 +1,8 @@
const ObservableStore = require('obs-store')
const ConfigManager = require('../../../app/scripts/lib/config-manager')
const IdStoreMigrator = require('../../../app/scripts/lib/idStore-migrator')
-const SimpleKeyring = require('../../../app/scripts/keyrings/simple')
-const normalize = require('../../../app/scripts/lib/sig-util').normalize
+const SimpleKeyring = require('eth-simple-keyring')
+const normalize = require('eth-sig-util').normalize
const oldStyleVault = require('../mocks/oldVault.json').data
const badStyleVault = require('../mocks/badVault.json').data
@@ -15,7 +15,7 @@ const SEED = 'fringe damage bounce extend tunnel afraid alert sound all soldier
QUnit.module('Old Style Vaults', {
beforeEach: function () {
let managers = managersFromInitState(oldStyleVault)
-
+
this.configManager = managers.configManager
this.migrator = managers.migrator
}
@@ -41,7 +41,7 @@ QUnit.test('migrator:migratedVaultForPassword', function (assert) {
QUnit.module('Old Style Vaults with bad HD seed', {
beforeEach: function () {
let managers = managersFromInitState(badStyleVault)
-
+
this.configManager = managers.configManager
this.migrator = managers.migrator
}
@@ -89,4 +89,4 @@ function managersFromInitState(initState){
})
return { configManager, migrator }
-} \ No newline at end of file
+}
diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index 7ded5b1ef..bd72a666e 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -52,7 +52,7 @@ describe('tx confirmation screen', function() {
clearSeedWordCache(cb) { cb() },
})
- let action = actions.cancelTx({id: firstTxId})
+ let action = actions.cancelTx({value: firstTxId})
result = reducers(initialState, action)
done()
})
@@ -121,7 +121,7 @@ describe('tx confirmation screen', function() {
metamask: {
unapprovedTxs: {
'1457634084250832': {
- id: 1457634084250832,
+ id: firstTxId,
status: "unconfirmed",
time: 1457634084250,
},
@@ -135,8 +135,9 @@ describe('tx confirmation screen', function() {
}
freeze(initialState)
+ // Mocking a background connection:
actions._setBackgroundConnection({
- approveTransaction(txId, cb) { cb() },
+ approveTransaction(firstTxId, cb) { cb() },
})
let action = actions.sendTx({id: firstTxId})(function(action) {
@@ -152,11 +153,6 @@ describe('tx confirmation screen', function() {
it('should transition to the first tx', function() {
assert.equal(result.appState.currentView.context, 0)
})
-
- it('should only have one unconfirmed tx remaining', function() {
- var count = getUnconfirmedTxCount(result)
- assert.equal(count, 1)
- })
})
})
});
diff --git a/test/unit/keyrings/hd-test.js b/test/unit/keyrings/hd-test.js
deleted file mode 100644
index dfc0ec908..000000000
--- a/test/unit/keyrings/hd-test.js
+++ /dev/null
@@ -1,127 +0,0 @@
-const assert = require('assert')
-const extend = require('xtend')
-const HdKeyring = require('../../../app/scripts/keyrings/hd')
-
-// Sample account:
-const privKeyHex = 'b8a9c05beeedb25df85f8d641538cbffedf67216048de9c678ee26260eb91952'
-
-const sampleMnemonic = 'finish oppose decorate face calm tragic certain desk hour urge dinosaur mango'
-const firstAcct = '1c96099350f13d558464ec79b9be4445aa0ef579'
-const secondAcct = '1b00aed43a693f3a957f9feb5cc08afa031e37a0'
-
-describe('hd-keyring', function() {
-
- let keyring
- beforeEach(function() {
- keyring = new HdKeyring()
- })
-
- describe('constructor', function(done) {
- keyring = new HdKeyring({
- mnemonic: sampleMnemonic,
- numberOfAccounts: 2,
- })
-
- const accounts = keyring.getAccounts()
- .then((accounts) => {
- assert.equal(accounts[0], firstAcct)
- assert.equal(accounts[1], secondAcct)
- done()
- })
- })
-
- describe('Keyring.type', function() {
- it('is a class property that returns the type string.', function() {
- const type = HdKeyring.type
- assert.equal(typeof type, 'string')
- })
- })
-
- describe('#type', function() {
- it('returns the correct value', function() {
- const type = keyring.type
- const correct = HdKeyring.type
- assert.equal(type, correct)
- })
- })
-
- describe('#serialize empty wallets.', function() {
- it('serializes a new mnemonic', function() {
- keyring.serialize()
- .then((output) => {
- assert.equal(output.numberOfAccounts, 0)
- assert.equal(output.mnemonic, null)
- })
- })
- })
-
- describe('#deserialize a private key', function() {
- it('serializes what it deserializes', function(done) {
- keyring.deserialize({
- mnemonic: sampleMnemonic,
- numberOfAccounts: 1
- })
- .then(() => {
- assert.equal(keyring.wallets.length, 1, 'restores two accounts')
- return keyring.addAccounts(1)
- }).then(() => {
- return keyring.getAccounts()
- }).then((accounts) => {
- assert.equal(accounts[0], firstAcct)
- assert.equal(accounts[1], secondAcct)
- assert.equal(accounts.length, 2)
-
- return keyring.serialize()
- }).then((serialized) => {
- assert.equal(serialized.mnemonic, sampleMnemonic)
- done()
- })
- })
- })
-
- describe('#addAccounts', function() {
- describe('with no arguments', function() {
- it('creates a single wallet', function(done) {
- keyring.addAccounts()
- .then(() => {
- assert.equal(keyring.wallets.length, 1)
- done()
- })
- })
- })
-
- describe('with a numeric argument', function() {
- it('creates that number of wallets', function(done) {
- keyring.addAccounts(3)
- .then(() => {
- assert.equal(keyring.wallets.length, 3)
- done()
- })
- })
- })
- })
-
- describe('#getAccounts', function() {
- it('calls getAddress on each wallet', function(done) {
-
- // Push a mock wallet
- const desiredOutput = 'foo'
- keyring.wallets.push({
- getAddress() {
- return {
- toString() {
- return desiredOutput
- }
- }
- }
- })
-
- const output = keyring.getAccounts()
- .then((output) => {
- assert.equal(output[0], desiredOutput)
- assert.equal(output.length, 1)
- done()
- })
- })
- })
-})
diff --git a/test/unit/keyrings/simple-test.js b/test/unit/keyrings/simple-test.js
deleted file mode 100644
index ba7dd448a..000000000
--- a/test/unit/keyrings/simple-test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-const assert = require('assert')
-const extend = require('xtend')
-const Web3 = require('web3')
-const web3 = new Web3()
-const ethUtil = require('ethereumjs-util')
-const SimpleKeyring = require('../../../app/scripts/keyrings/simple')
-const TYPE_STR = 'Simple Key Pair'
-
-// Sample account:
-const privKeyHex = 'b8a9c05beeedb25df85f8d641538cbffedf67216048de9c678ee26260eb91952'
-
-describe('simple-keyring', function() {
-
- let keyring
- beforeEach(function() {
- keyring = new SimpleKeyring()
- })
-
- describe('Keyring.type', function() {
- it('is a class property that returns the type string.', function() {
- const type = SimpleKeyring.type
- assert.equal(type, TYPE_STR)
- })
- })
-
- describe('#type', function() {
- it('returns the correct value', function() {
- const type = keyring.type
- assert.equal(type, TYPE_STR)
- })
- })
-
- describe('#serialize empty wallets.', function() {
- it('serializes an empty array', function(done) {
- keyring.serialize()
- .then((output) => {
- assert.deepEqual(output, [])
- done()
- })
- })
- })
-
- describe('#deserialize a private key', function() {
- it('serializes what it deserializes', function() {
- keyring.deserialize([privKeyHex])
- .then(() => {
- assert.equal(keyring.wallets.length, 1, 'has one wallet')
- const serialized = keyring.serialize()
- assert.equal(serialized[0], privKeyHex)
- })
- })
- })
-
- describe('#signMessage', function() {
- const address = '0x9858e7d8b79fc3e6d989636721584498926da38a'
- const message = '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0'
- const privateKey = '0x7dd98753d7b4394095de7d176c58128e2ed6ee600abe97c9f6d9fd65015d9b18'
- const expectedResult = '0x28fcb6768e5110144a55b2e6ce9d1ea5a58103033632d272d2b5cf506906f7941a00b539383fd872109633d8c71c404e13dba87bc84166ee31b0e36061a69e161c'
-
- it('passes the dennis test', function(done) {
- keyring.deserialize([ privateKey ])
- .then(() => {
- return keyring.signMessage(address, message)
- })
- .then((result) => {
- assert.equal(result, expectedResult)
- done()
- })
- })
-
- it('reliably can decode messages it signs', function (done) {
-
- const message = 'hello there!'
- const msgHashHex = web3.sha3(message)
- let address
- let addresses = []
-
- keyring.deserialize([ privateKey ])
- .then(() => {
- keyring.addAccounts(9)
- })
- .then(() => {
- return keyring.getAccounts()
- })
- .then((addrs) => {
- addresses = addrs
- return Promise.all(addresses.map((address) => {
- return keyring.signMessage(address, msgHashHex)
- }))
- })
- .then((signatures) => {
-
- signatures.forEach((sgn, index) => {
- const address = addresses[index]
-
- var r = ethUtil.toBuffer(sgn.slice(0,66))
- var s = ethUtil.toBuffer('0x' + sgn.slice(66,130))
- var v = ethUtil.bufferToInt(ethUtil.toBuffer('0x' + sgn.slice(130,132)))
- var m = ethUtil.toBuffer(msgHashHex)
- var pub = ethUtil.ecrecover(m, v, r, s)
- var adr = '0x' + ethUtil.pubToAddress(pub).toString('hex')
-
- assert.equal(adr, address, 'recovers address from signature correctly')
- })
- done()
- })
- })
- })
-
- describe('#addAccounts', function() {
- describe('with no arguments', function() {
- it('creates a single wallet', function() {
- keyring.addAccounts()
- .then(() => {
- assert.equal(keyring.wallets.length, 1)
- })
- })
- })
-
- describe('with a numeric argument', function() {
- it('creates that number of wallets', function() {
- keyring.addAccounts(3)
- .then(() => {
- assert.equal(keyring.wallets.length, 3)
- })
- })
- })
- })
-
- describe('#getAccounts', function() {
- it('calls getAddress on each wallet', function(done) {
-
- // Push a mock wallet
- const desiredOutput = '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761'
- keyring.wallets.push({
- getAddress() {
- return ethUtil.toBuffer(desiredOutput)
- }
- })
-
- keyring.getAccounts()
- .then((output) => {
- assert.equal(output[0], desiredOutput)
- assert.equal(output.length, 1)
- done()
- })
- })
- })
-})
diff --git a/test/unit/personal-message-manager-test.js b/test/unit/personal-message-manager-test.js
new file mode 100644
index 000000000..657d5e675
--- /dev/null
+++ b/test/unit/personal-message-manager-test.js
@@ -0,0 +1,89 @@
+const assert = require('assert')
+const extend = require('xtend')
+const EventEmitter = require('events')
+
+const PersonalMessageManager = require('../../app/scripts/lib/personal-message-manager')
+
+describe('Transaction Manager', function() {
+ let messageManager
+
+ beforeEach(function() {
+ messageManager = new PersonalMessageManager()
+ })
+
+ describe('#getMsgList', function() {
+ it('when new should return empty array', function() {
+ var result = messageManager.messages
+ assert.ok(Array.isArray(result))
+ assert.equal(result.length, 0)
+ })
+ it('should also return transactions from local storage if any', function() {
+
+ })
+ })
+
+ describe('#addMsg', function() {
+ it('adds a Msg returned in getMsgList', function() {
+ var Msg = { id: 1, status: 'approved', metamaskNetworkId: 'unit test' }
+ messageManager.addMsg(Msg)
+ var result = messageManager.messages
+ assert.ok(Array.isArray(result))
+ assert.equal(result.length, 1)
+ assert.equal(result[0].id, 1)
+ })
+ })
+
+ describe('#setMsgStatusApproved', function() {
+ it('sets the Msg status to approved', function() {
+ var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+ messageManager.addMsg(Msg)
+ messageManager.setMsgStatusApproved(1)
+ var result = messageManager.messages
+ assert.ok(Array.isArray(result))
+ assert.equal(result.length, 1)
+ assert.equal(result[0].status, 'approved')
+ })
+ })
+
+ describe('#rejectMsg', function() {
+ it('sets the Msg status to rejected', function() {
+ var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+ messageManager.addMsg(Msg)
+ messageManager.rejectMsg(1)
+ var result = messageManager.messages
+ assert.ok(Array.isArray(result))
+ assert.equal(result.length, 1)
+ assert.equal(result[0].status, 'rejected')
+ })
+ })
+
+ describe('#_updateMsg', function() {
+ it('replaces the Msg with the same id', function() {
+ messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
+ messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+ messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: 'unit test' })
+ var result = messageManager.getMsg('1')
+ assert.equal(result.hash, 'foo')
+ })
+ })
+
+ describe('#getUnapprovedMsgs', function() {
+ it('returns unapproved Msgs in a hash', function() {
+ messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
+ messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+ let result = messageManager.getUnapprovedMsgs()
+ assert.equal(typeof result, 'object')
+ assert.equal(result['1'].status, 'unapproved')
+ assert.equal(result['2'], undefined)
+ })
+ })
+
+ describe('#getMsg', function() {
+ it('returns a Msg with the requested id', function() {
+ messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
+ messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+ assert.equal(messageManager.getMsg('1').status, 'unapproved')
+ assert.equal(messageManager.getMsg('2').status, 'approved')
+ })
+ })
+})
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:29:47 +0800