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

fixes on jsdoc

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-25 13:58:10 -03:00
commit 10938b43d8
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/TxProposal.js
View file

@ -419,6 +419,9 @@ TxProposal.prototype.setCopayers = function(senderId, keyMap, readOnlyPeers) {
// merge will not merge any metadata. // merge will not merge any metadata.
TxProposal.prototype.merge = function(incoming) { TxProposal.prototype.merge = function(incoming) {
preconditions.checkArgument(_.isFunction(incoming._sync));
incoming._sync();
// Note that all inputs must have the same number of signatures, so checking // Note that all inputs must have the same number of signatures, so checking
// one (0) is OK. // one (0) is OK.
var before = this._inputSigners[0].length; var before = this._inputSigners[0].length;

1
js/models/TxProposals.js
View file

@ -98,7 +98,6 @@ TxProposals.prototype.toObj = function() {
TxProposals.prototype.merge = function(inObj, builderOpts) { TxProposals.prototype.merge = function(inObj, builderOpts) {
var incomingTx = TxProposal.fromUntrustedObj(inObj, builderOpts); var incomingTx = TxProposal.fromUntrustedObj(inObj, builderOpts);
incomingTx._sync();
var myTxps = this.txps; var myTxps = this.txps;
var ntxid = incomingTx.getId(); var ntxid = incomingTx.getId();

7
js/models/Wallet.js
View file

@ -2081,15 +2081,14 @@ Wallet.prototype.maxRejectCount = function() {
/** /**
* @callback getUnspentCallback * @callback getUnspentCallback
* @TODO: Document this better * @desc Get a list of unspent transaction outputs
* @param {string} error * @param {string} error
* @param {Object[]} safeUnspendList * @param {Object[]} safeUnspendList
* @param {Object[]} unspentList * @param {Object[]} unspentList
*/
/* @ TODO add cached?
* @desc Get a list of unspent transaction outputs
* @param {getUnspentCallback} cb * @param {getUnspentCallback} cb
*/ */
// TODO: Can we add cache to getUnspent?
Wallet.prototype.getUnspent = function(cb) { Wallet.prototype.getUnspent = function(cb) {
var self = this; var self = this;
this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) { this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) {