anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

all test passing, after rebasing

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-15 17:45:06 -03:00
commit 415861df29
2 changed files with 57 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/models/core/WalletFactory.js
View file

@ -86,10 +86,12 @@ WalletFactory.prototype.obtainNetworkName = function(obj) {
* @param {string[]} skipFields - fields to skip when importing * @param {string[]} skipFields - fields to skip when importing
* @return {Wallet} * @return {Wallet}
*/ */
WalletFactory.prototype.fromObj = function(obj, skipFields) { WalletFactory.prototype.fromObj = function(inObj, skipFields) {
var networkName = this.obtainNetworkName(obj); var networkName = this.obtainNetworkName(inObj);
preconditions.checkState(networkName); preconditions.checkState(networkName);
preconditions.checkArgument(obj); preconditions.checkArgument(inObj);
var obj = JSON.parse(JSON.stringify(inObj));
// not stored options // not stored options
obj.opts = obj.opts || {}; obj.opts = obj.opts || {};
@ -421,8 +423,8 @@ WalletFactory.prototype.joinCreateSession = function(opts, cb) {
} }
data.opts.privateKey = privateKey; data.opts.privateKey = privateKey;
data.opts.nickname = nickname; data.opts.nickname = opts.nickname;
data.opts.passphrase = passphrase; data.opts.passphrase = opts.passphrase;
data.opts.id = data.walletId; data.opts.id = data.walletId;
self.create(data.opts, function(err, w) { self.create(data.opts, function(err, w) {
if (!err & w) { if (!err & w) {

153
test/test.WalletFactory.js
View file

File diff suppressed because one or more lines are too long