mirror of https://github.com/BTCPrivate/copay.git
Fix tests
This commit is contained in:
parent
a1e5246727
commit
c00deb25f9
|
@ -779,7 +779,7 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr
|
<tr
|
||||||
ng-repeat="(addr, info) in $root.wallet.addressBook
|
ng-repeat="(addr, info) in $root.wallet.addressBook"
|
||||||
ng-class="{'addressbook-disabled': info.hidden}">
|
ng-class="{'addressbook-disabled': info.hidden}">
|
||||||
<td><a ng-click="copyAddress(addr)" title="Copy address">{{info.label}}</a></td>
|
<td><a ng-click="copyAddress(addr)" title="Copy address">{{info.label}}</a></td>
|
||||||
<td>{{addr}}</td>
|
<td>{{addr}}</td>
|
||||||
|
|
|
@ -826,36 +826,26 @@ describe('Wallet model', function() {
|
||||||
|
|
||||||
it('handle network addressBook correctly', function() {
|
it('handle network addressBook correctly', function() {
|
||||||
var w = createW();
|
var w = createW();
|
||||||
var pk = '026a55261b7c898fff760ebe14fd22a71892295f3b49e0ca66727bc0a0d7f94d03';
|
|
||||||
var data = {
|
var data = {
|
||||||
walletId: w.id,
|
type: "addressbook",
|
||||||
addressBook: {
|
addressBook: {
|
||||||
'msj42CCGruhRsFrGATiUuh25dtxYtnpbTx': {
|
"3Ae1ieAYNXznm7NkowoFTu5MkzgrTfDz8Z" : {
|
||||||
label: 'Faucet',
|
copayerId: "03baa45498fee1045fa8f91a2913f638dc3979b455498924d3cf1a11303c679cdb",
|
||||||
copayerId: pk,
|
createdTs: 1404769393509,
|
||||||
createdTs: 1403102115,
|
hidden: false,
|
||||||
|
label: "adsf",
|
||||||
|
signature: "3046022100d4cdefef66ab8cea26031d5df03a38fc9ec9b09b0fb31d3a26b6e204918e9e78022100ecdbbd889ec99ea1bfd471253487af07a7fa7c0ac6012ca56e10e66f335e4586"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
type: 'addressbook'
|
walletId: "11d23e638ed84c06",
|
||||||
|
isBroadcast: 1
|
||||||
};
|
};
|
||||||
var payload = {
|
|
||||||
address: 'msj42CCGruhRsFrGATiUuh25dtxYtnpbTx',
|
var senderId = "03baa45498fee1045fa8f91a2913f638dc3979b455498924d3cf1a11303c679cdb";
|
||||||
label: 'Faucet',
|
|
||||||
copayerId: pk,
|
|
||||||
createdTs: 1403102115,
|
|
||||||
};
|
|
||||||
data.addressBook['msj42CCGruhRsFrGATiUuh25dtxYtnpbTx'].signature = w.signJson(payload);
|
|
||||||
|
|
||||||
Object.keys(w.addressBook).length.should.equal(2);
|
Object.keys(w.addressBook).length.should.equal(2);
|
||||||
// New address
|
w._handleAddressBook(senderId, data, true);
|
||||||
w._handleAddressBook(pk, data, true);
|
|
||||||
Object.keys(w.addressBook).length.should.equal(3);
|
|
||||||
// Existent address
|
|
||||||
w._handleAddressBook(pk, data, true);
|
|
||||||
Object.keys(w.addressBook).length.should.equal(3);
|
|
||||||
// Address with wrong signature (do nothing)
|
|
||||||
data.addressBook['msj42CCGruhRsFrGATiUuh25dtxYtnpbTx'].label = 'Bad'
|
|
||||||
w._handleAddressBook(pk, data, true);
|
|
||||||
Object.keys(w.addressBook).length.should.equal(3);
|
Object.keys(w.addressBook).length.should.equal(3);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -872,43 +862,38 @@ describe('Wallet model', function() {
|
||||||
|
|
||||||
it('should verify signed object', function() {
|
it('should verify signed object', function() {
|
||||||
var w = createW();
|
var w = createW();
|
||||||
var pk = '026a55261b7c898fff760ebe14fd22a71892295f3b49e0ca66727bc0a0d7f94d03';
|
|
||||||
var data = {
|
|
||||||
address: 'msj42CCGruhRsFrGATiUuh25dtxYtnpbTx',
|
|
||||||
label: 'Faucet',
|
|
||||||
copayerId: pk,
|
|
||||||
createdTs: 1403102115,
|
|
||||||
};
|
|
||||||
var signature = w.signJson(data);
|
|
||||||
|
|
||||||
w.verifySignedJson(pk, data, signature).should.equal(true);
|
var payload = {
|
||||||
data.label = 'Another';
|
address: "3Ae1ieAYNXznm7NkowoFTu5MkzgrTfDz8Z",
|
||||||
w.verifySignedJson(pk, data, signature).should.equal(false);
|
label: "adsf",
|
||||||
|
copayerId: "03baa45498fee1045fa8f91a2913f638dc3979b455498924d3cf1a11303c679cdb",
|
||||||
|
createdTs: 1404769393509
|
||||||
|
}
|
||||||
|
|
||||||
|
var signature = "3046022100d4cdefef66ab8cea26031d5df03a38fc9ec9b09b0fb31d3a26b6e204918e9e78022100ecdbbd889ec99ea1bfd471253487af07a7fa7c0ac6012ca56e10e66f335e4586";
|
||||||
|
|
||||||
|
var pubKey = "03baa45498fee1045fa8f91a2913f638dc3979b455498924d3cf1a11303c679cdb";
|
||||||
|
|
||||||
|
w.verifySignedJson(pubKey, payload, signature).should.equal(true);
|
||||||
|
payload.label = 'Another';
|
||||||
|
w.verifySignedJson(pubKey, payload, signature).should.equal(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should verify signed addressbook entry', function() {
|
it('should verify signed addressbook entry', function() {
|
||||||
var w = createW();
|
var w = createW();
|
||||||
var key = 'msj42CCGruhRsFrGATiUuh25dtxYtnpbTx';
|
var key = "3Ae1ieAYNXznm7NkowoFTu5MkzgrTfDz8Z";
|
||||||
var pk = '026a55261b7c898fff760ebe14fd22a71892295f3b49e0ca66727bc0a0d7f94d03';
|
var pubKey = "03baa45498fee1045fa8f91a2913f638dc3979b455498924d3cf1a11303c679cdb";
|
||||||
var payload = {
|
w.addressBook[key] = {
|
||||||
address: key,
|
copayerId: pubKey,
|
||||||
label: 'Faucet',
|
createdTs: 1404769393509,
|
||||||
copayerId: pk,
|
|
||||||
createdTs: 1403102115,
|
|
||||||
};
|
|
||||||
|
|
||||||
var addressbook = {
|
|
||||||
hidden: false,
|
hidden: false,
|
||||||
createdTs: payload.createdTs,
|
label: "adsf",
|
||||||
copayerId: payload.copayerId,
|
signature: "3046022100d4cdefef66ab8cea26031d5df03a38fc9ec9b09b0fb31d3a26b6e204918e9e78022100ecdbbd889ec99ea1bfd471253487af07a7fa7c0ac6012ca56e10e66f335e4586"
|
||||||
label: payload.label,
|
|
||||||
signature: w.signJson(payload)
|
|
||||||
};
|
};
|
||||||
w.addressBook[key] = addressbook;
|
|
||||||
|
|
||||||
w.verifyAddressbookSignature(pk, key).should.equal(true);
|
w.verifyAddressbookSignature(pubKey, key).should.equal(true);
|
||||||
w.addressBook[key].label = 'Another';
|
w.addressBook[key].label = 'Another';
|
||||||
w.verifyAddressbookSignature(pk, key).should.equal(false);
|
w.verifyAddressbookSignature(pubKey, key).should.equal(false);
|
||||||
(function() {
|
(function() {
|
||||||
w.verifyAddressbookSignature();
|
w.verifyAddressbookSignature();
|
||||||
}).should.throw();
|
}).should.throw();
|
||||||
|
|
Loading…
Reference in New Issue