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

add tests to _onPublicKeyRing

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-02 15:18:56 -03:00
commit b3584aea77
3 changed files with 69 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/models/PublicKeyRing.js
View file

@ -76,6 +76,7 @@ PublicKeyRing.prototype.resetCache = function() {
* as a parameter
*/
PublicKeyRing.trim = function(data) {
preconditions.checkArgument(data);
var opts = {};
['walletId', 'networkName', 'requiredCopayers', 'totalCopayers',
'indexes', 'nicknameFor', 'copayersExtPubKeys'
@ -698,6 +699,7 @@ PublicKeyRing.prototype.getRedeemScriptMap = function(paths) {
*/
PublicKeyRing.prototype._checkInPKR = function(inPKR, ignoreId) {
preconditions.checkArgument(_.isObject(inPKR));
if (!ignoreId && this.walletId !== inPKR.walletId)
throw new Error('inPKR walletId mismatch');
@ -786,8 +788,8 @@ PublicKeyRing.prototype.mergeIndexes = function(indexes) {
* @return {boolean} true if the internal state has changed
*/
PublicKeyRing.prototype.merge = function(inPKR, ignoreId) {
this._checkInPKR(inPKR, ignoreId);
this._checkInPKR(inPKR, ignoreId);
var hasChanged = false;
hasChanged |= this.mergeIndexes(inPKR.indexes);
hasChanged |= this._mergePubkeys(inPKR);

7
js/models/Wallet.js
View file

@ -327,15 +327,18 @@ Wallet.prototype._onPublicKeyRing = function(senderId, data) {
try {
hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e) {
log.debug('Wallet:' + this.id + '## WALLET ERROR', e);
this.emitAndKeepAlive('connectionError', e.message);
log.warn('Wallet:' + this.id, e);
return;
}
if (hasChanged) {
console.log('[Wallet.js.333:hasChanged:]',hasChanged); //TODO
if (wasIncomplete) {
this.sendPublicKeyRing();
}
console.log('[Wallet.js.335:wasIncomplete:]',wasIncomplete); //TODO
if (this.publicKeyRing.isComplete()) {
console.log('[Wallet.js.338]'); //TODO
this._lockIncomming();
}