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

add preconditions and tests

Browse source
This commit is contained in:
Manuel Araoz 2014-06-18 10:09:40 -03:00
commit 889edf4b92
5 changed files with 87 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/models/core/TxProposals.js
View file

@ -54,8 +54,7 @@ TxProposal.getSentTs = function() {
TxProposal.prototype.merge = function(other) {
var ret = {};
ret.events = this.mergeMetadata(other);
ret.hasChanged = this.mergeBuilder(other); // TODO: use this?
ret.hasChanged = this.mergeBuilder(other);
return ret;
};
@ -151,6 +150,7 @@ TxProposals.prototype.getNtxids = function() {
};
TxProposals.prototype.toObj = function(onlyThisNtxid) {
if (onlyThisNtxid) throw new Error();
var ret = [];
for (var id in this.txps) {
@ -172,14 +172,15 @@ TxProposals.prototype.merge = function(inTxp) {
var myTxps = this.txps;
var ntxid = inTxp.getID();
var ret;
var ret = {};
ret.events = [];
ret.events.hasChanged = false;
if (myTxps[ntxid]) {
var v0 = myTxps[ntxid];
var v1 = inTxp;
ret = v0.merge(v1);
} else {
ret.events = {};
ret.hasChanged = true;
ret.events.push({
type: 'new',