From c37c050c8a119e4c2de1edea474c3c3d5ad1cf99 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Mon, 12 Sep 2016 10:34:06 -0700
Subject: Revert "Add new eth-lightwallet salting to vault."

---
 test/unit/idStore-test.js | 81 ++++++-----------------------------------------
 1 file changed, 10 insertions(+), 71 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/idStore-test.js b/test/unit/idStore-test.js
index 1ed1bf9a7..ee4613236 100644
--- a/test/unit/idStore-test.js
+++ b/test/unit/idStore-test.js
@@ -1,8 +1,6 @@
 var assert = require('assert')
 var IdentityStore = require('../../app/scripts/lib/idStore')
 var configManagerGen = require('../lib/mock-config-manager')
-const ethUtil = require('ethereumjs-util')
-const async = require('async')
 
 describe('IdentityStore', function() {
 
@@ -20,12 +18,11 @@ describe('IdentityStore', function() {
       idStore = new IdentityStore({
         configManager: configManagerGen(),
         ethStore: {
-          addAccount(acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
+          addAccount(acct) { accounts.push(acct) },
         },
       })
 
       idStore.createNewVault(password, entropy, (err, seeds) => {
-        assert.ifError(err, 'createNewVault threw error')
         seedWords = seeds
         originalKeystore = idStore._idmgmt.keyStore
         done()
@@ -41,7 +38,7 @@ describe('IdentityStore', function() {
         idStore = new IdentityStore({
           configManager: configManagerGen(),
           ethStore: {
-            addAccount(acct) { newAccounts.push(ethUtil.addHexPrefix(acct)) },
+            addAccount(acct) { newAccounts.push(acct) },
           },
         })
       })
@@ -60,90 +57,32 @@ describe('IdentityStore', function() {
   })
 
   describe('#recoverFromSeed BIP44 compliance', function() {
-   const salt = 'lightwalletSalt'
+    let seedWords =  'picnic injury awful upper eagle junk alert toss flower renew silly vague'
+    let firstAccount = '0x5d8de92c205279c10e5669f797b853ccef4f739a'
 
     let password = 'secret!'
     let accounts = []
     let idStore
 
-    var assertions = [
-      {
-        seed: 'picnic injury awful upper eagle junk alert toss flower renew silly vague',
-        account: '0x5d8de92c205279c10e5669f797b853ccef4f739a',
-      },
-      {
-        seed: 'radar blur cabbage chef fix engine embark joy scheme fiction master release',
-        account: '0xe15d894becb0354c501ae69429b05143679f39e0',
-      },
-      {
-         seed: 'phone coyote caught pattern found table wedding list tumble broccoli chief swing',
-        account: '0xb0e868f24bc7fec2bce2efc2b1c344d7569cd9d2',
-      },
-      {
-        seed: 'recycle tag bird palace blue village anxiety census cook soldier example music',
-        account: '0xab34a45920afe4af212b96ec51232aaa6a33f663',
-      },
-      {
-        seed: 'half glimpse tape cute harvest sweet bike voyage actual floor poet lazy',
-        account: '0x28e9044597b625ac4beda7250011670223de43b2',
-      },
-      {
-        seed: 'flavor tiger carpet motor angry hungry document inquiry large critic usage liar',
-        account: '0xb571be96558940c4e9292e1999461aa7499fb6cd',
-      },
-    ]
-
     before(function() {
       window.localStorage = {} // Hacking localStorage support into JSDom
 
       idStore = new IdentityStore({
         configManager: configManagerGen(),
         ethStore: {
-          addAccount(acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
+          addAccount(acct) { accounts.push(acct) },
         },
       })
     })
 
-    beforeEach(function() {
-      accounts = []
-    })
-
-    it('should enforce seed compliance with TestRPC', function (done) {
-      const tests = assertions.map((assertion) => {
-        return function (cb) {
-          accounts = []
-          idStore.recoverFromSeed(password, assertion.seed, (err) => {
-            assert.ifError(err)
-
-            var received = accounts[0].toLowerCase()
-            var expected = assertion.account.toLowerCase()
-            assert.equal(received, expected)
-            cb()
-          })
-        }
-      })
+    it('should return the expected first account', function (done) {
 
-      async.series(tests, function(err, results) {
+      idStore.recoverFromSeed(password, seedWords, (err) => {
         assert.ifError(err)
-        done()
-      })
-    })
 
-    it('should allow restoring and unlocking again', function (done) {
-      const assertion = assertions[0]
-      idStore.recoverFromSeed(password, assertion.seed, (err) => {
-        assert.ifError(err)
-
-        var received = accounts[0].toLowerCase()
-        var expected = assertion.account.toLowerCase()
-        assert.equal(received, expected)
-
-
-        idStore.submitPassword(password, function(err, account) {
-          assert.ifError(err)
-          assert.equal(account, expected)
-          done()
-        })
+        let newKeystore = idStore._idmgmt.keyStore
+        assert.equal(accounts[0], firstAccount)
+        done()
       })
     })
   })
-- 
cgit