BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add some parenthesis

This commit is contained in:
Manuel Araoz 2014-08-22 13:24:42 -04:00
parent c6e151db99
commit 0f67d3e6bd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/models/core/Wallet.js
View File

@ -554,16 +554,17 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
opts.addressBook = o.addressBook; opts.addressBook = o.addressBook;
if (o.privateKey) if (o.privateKey) {
opts.privateKey = PrivateKey.fromObj(o.privateKey); opts.privateKey = PrivateKey.fromObj(o.privateKey);
else } else {
opts.privateKey = new PrivateKey({ opts.privateKey = new PrivateKey({
networkName: opts.networkName networkName: opts.networkName
}); });
}
if (o.publicKeyRing) if (o.publicKeyRing) {
opts.publicKeyRing = PublicKeyRing.fromObj(o.publicKeyRing); opts.publicKeyRing = PublicKeyRing.fromObj(o.publicKeyRing);
else { } else {
opts.publicKeyRing = new PublicKeyRing({ opts.publicKeyRing = new PublicKeyRing({
networkName: opts.networkName, networkName: opts.networkName,
requiredCopayers: opts.requiredCopayers, requiredCopayers: opts.requiredCopayers,
@ -575,13 +576,14 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
); );
} }
if (o.txProposals) if (o.txProposals) {
opts.txProposals = TxProposals.fromObj(o.txProposals, Wallet.builderOpts); opts.txProposals = TxProposals.fromObj(o.txProposals, Wallet.builderOpts);
else } else {
opts.txProposals = new TxProposals({ opts.txProposals = new TxProposals({
networkName: this.networkName, networkName: this.networkName,
}); });
}
opts.lastTimestamp = o.lastTimestamp; opts.lastTimestamp = o.lastTimestamp;
opts.storage = storage; opts.storage = storage;