This repository has been archived by the owner on Mar 7, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 284
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #209 from blockchain/restore-fix
fix(restore): restore is checking for further accounts.
- Loading branch information
Showing
7 changed files
with
114 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,11 +7,6 @@ WalletNetwork = | |
| new Promise((resolve) -> resolve(['a8098c1a-f8', 'b77e160355e'])) | ||
| else | ||
| new Promise((resolve) -> resolve(['a8098c1a-f86e-11da-bd1a-00112444be1e', '6fa459ea-ee8a-3ca4-894e-db77e160355e'])) | ||
| insertWallet: () -> | ||
| if WalletNetwork.failInsertion | ||
| new Promise((resolve, reject) -> reject()) | ||
| else | ||
| new Promise((resolve) -> resolve()) | ||
|
|
||
| Wallet = | ||
| new: (guid, sharedKey, mnemonic, bip39Password, firstAccountLabel, success, error) -> success() | ||
|
|
@@ -75,27 +70,3 @@ describe "WalletSignup", -> | |
| expect(observers.success).toHaveBeenCalled() | ||
| expect(observers.error).not.toHaveBeenCalled() | ||
| expect(observers.progress).toHaveBeenCalled() | ||
|
|
||
| describe "should fail when the wallet insertion fails", -> | ||
|
|
||
| observers = null | ||
|
|
||
| beforeEach (done) -> | ||
| observers = | ||
| success: () -> done() | ||
| error: () -> done() | ||
| progress: () -> | ||
|
|
||
| spyOn(observers, "success").and.callThrough() | ||
| spyOn(observers, "error").and.callThrough() | ||
| spyOn(observers, "progress") | ||
|
|
||
| WalletNetwork.failInsertion = true | ||
| WalletSignup.generateNewWallet('totot', '[email protected]', undefined, undefined, 'My Wallet', observers.success, observers.error, observers.progress) | ||
|
|
||
| it "", -> | ||
| expect(observers.success).not.toHaveBeenCalled() | ||
| expect(observers.error).toHaveBeenCalled() | ||
| expect(observers.progress).toHaveBeenCalled() | ||
|
|
||
| WalletNetwork.failInsertion = false | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,12 +4,31 @@ WalletStore = { | |
| setGuid: () -> | ||
| setRealAuthType: () -> | ||
| setSyncPubKeys: () -> | ||
| setLanguage: () -> | ||
| } | ||
|
|
||
| BlockchainSettingsAPI = { | ||
| change_language: () -> | ||
| change_local_currency: () -> | ||
| } | ||
|
|
||
| WalletCrypto = {} | ||
|
|
||
| hdwallet = { | ||
| guid: "1234", | ||
| sharedKey: "shared" | ||
| scanBip44: () -> { | ||
| then: (cb) -> | ||
| cb() | ||
| { | ||
| catch: () -> | ||
| } | ||
| } | ||
| } | ||
|
|
||
| WalletSignup = { | ||
| generateNewWallet: () -> | ||
| generateNewWallet: (inputedPassword, inputedEmail, mnemonic, bip39Password, firstAccountName, successCallback, errorCallback) -> | ||
| successCallback(hdwallet) | ||
| } | ||
|
|
||
| API = | ||
|
|
@@ -37,13 +56,23 @@ RNG = { | |
| "random" | ||
| } | ||
|
|
||
| WalletNetwork = | ||
| insertWallet: () -> | ||
| console.log(WalletNetwork.failInsertion) | ||
| if WalletNetwork.failInsertion | ||
| new Promise((resolve, reject) -> reject()) | ||
| else | ||
| new Promise((resolve) -> resolve()) | ||
|
|
||
| stubs = { | ||
| './wallet-store': WalletStore, | ||
| './wallet-crypto': WalletCrypto, | ||
| './wallet-signup': WalletSignup, | ||
| './api': API, | ||
| 'bip39': BIP39, | ||
| './rng' : RNG | ||
| './rng' : RNG, | ||
| './wallet-network': WalletNetwork, | ||
| './blockchain-settings-api' : BlockchainSettingsAPI | ||
| } | ||
|
|
||
| MyWallet = proxyquire('../src/wallet', stubs) | ||
|
|
@@ -53,6 +82,10 @@ describe "Wallet", -> | |
| callbacks = undefined | ||
|
|
||
| beforeEach -> | ||
| JasminePromiseMatchers.install() | ||
|
|
||
| afterEach -> | ||
| JasminePromiseMatchers.uninstall() | ||
|
|
||
| describe "makePairingCode()", -> | ||
| success = undefined | ||
|
|
@@ -312,9 +345,7 @@ describe "Wallet", -> | |
|
|
||
| describe "recoverFromMnemonic", -> | ||
| beforeEach -> | ||
| spyOn(WalletSignup, "generateNewWallet").and.callFake((password, email, mnemonic, bip39Password, firstAccountName, success, error, generateUUIDProgress, decryptWalletProgress) -> | ||
| success("1234", "shared", password) | ||
| ) | ||
| spyOn(WalletSignup, "generateNewWallet").and.callThrough() | ||
| spyOn(WalletStore, "unsafeSetPassword") | ||
|
|
||
| it "should generate a new wallet", -> | ||
|
|
@@ -328,14 +359,24 @@ describe "Wallet", -> | |
| MyWallet.recoverFromMnemonic("[email protected]", "secret", "nuclear bunker sphaghetti monster dim sum sauce", undefined, (() ->)) | ||
| expect(WalletStore.unsafeSetPassword).toHaveBeenCalledWith("secret") | ||
|
|
||
| it "should pass guid, shared key and password upon success", -> | ||
| it "should pass guid, shared key and password upon success", (done) -> | ||
| obs = { | ||
| success: () -> | ||
| } | ||
| spyOn(obs, "success") | ||
| spyOn(obs, "success").and.callThrough() | ||
|
|
||
| MyWallet.recoverFromMnemonic("[email protected]", "secret", "nuclear bunker sphaghetti monster dim sum sauce", undefined, obs.success) | ||
| expect(obs.success).toHaveBeenCalledWith({ guid: '1234', sharedKey: 'shared', password: 'secret' }) | ||
|
|
||
| result = () -> | ||
| expect(obs.success).toHaveBeenCalledWith({ guid: '1234', sharedKey: 'shared', password: 'secret' }) | ||
| done() | ||
|
|
||
| setTimeout(result, 1) | ||
|
|
||
| it "should scan address space", -> | ||
| spyOn(hdwallet, "scanBip44").and.callThrough() | ||
| MyWallet.recoverFromMnemonic("[email protected]", "secret", "nuclear bunker sphaghetti monster dim sum sauce", undefined, (() ->)) | ||
| expect(hdwallet.scanBip44).toHaveBeenCalled() | ||
|
|
||
| describe "createNewWallet", -> | ||
| beforeEach -> | ||
|
|
@@ -353,3 +394,26 @@ describe "Wallet", -> | |
| # inside the RNG | ||
| RNG.shouldThrow = true | ||
| expect(() -> MyWallet.createNewWallet()).toThrow('Connection failed') | ||
| RNG.shouldThrow = false | ||
|
|
||
| describe "when the wallet insertion fails", -> | ||
|
|
||
| observers = null | ||
|
|
||
| beforeEach (done) -> | ||
| observers = | ||
| success: () -> done() | ||
| error: () -> done() | ||
|
|
||
| spyOn(observers, "success").and.callThrough() | ||
| spyOn(observers, "error").and.callThrough() | ||
|
|
||
| WalletNetwork.failInsertion = true | ||
| MyWallet.createNewWallet('[email protected]', "1234", 'My Wallet', 'en', 'usd', observers.success, observers.error) | ||
|
|
||
| it "should fail", -> | ||
| expect(observers.success).not.toHaveBeenCalled() | ||
| expect(observers.error).toHaveBeenCalled() | ||
|
|
||
| afterEach -> | ||
| WalletNetwork.failInsertion = false | ||