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

Merge pull request #1562 from matiaspando/error/cryptojs

Browse source 
Error/cryptojs
This commit is contained in:
Matias Alejo Garcia 2014-10-11 17:13:48 -03:00
commit 4741f12060
8 changed files with 95 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/Passphrase.js
View file

@ -9,22 +9,22 @@ describe('Passphrase model', function() {
should.exist(p);
});
it('should generate key from password', function (done) {
var p = new Passphrase({
salt: 'mjuBtGybi/4=',
iterations: 10,
});
var pass = '123456';
var k = p.get(pass);
var k64 = p.getBase64(pass);
it('should generate key from password', function(done) {
var p = new Passphrase({
salt: 'mjuBtGybi/4=',
iterations: 10,
});
var pass = '123456';
var k = p.get(pass);
var k64 = p.getBase64(pass);
// Note: hashes were generated using CryptoJS
k.toString().should.equal('2283fe11b9a189b82f1c09200806920cbdd8ef752f53dea910f90ab526f441acdbd5128555647a7e390a1a9fea042226963ccd0f7851030b3d6e282ccebaa17e');
k64.toString().should.equal('IoP+EbmhibgvHAkgCAaSDL3Y73UvU96pEPkKtSb0Qazb1RKFVWR6fjkKGp/qBCImljzND3hRAws9bigszrqhfg==');
p.getBase64Async(pass, function (ret) {
ret.toString().should.equal('IoP+EbmhibgvHAkgCAaSDL3Y73UvU96pEPkKtSb0Qazb1RKFVWR6fjkKGp/qBCImljzND3hRAws9bigszrqhfg==');
// Note: hashes were generated using CryptoJS
k.toString().should.equal('2283fe11b9a189b82f1c09200806920cbdd8ef752f53dea910f90ab526f441acdbd5128555647a7e390a1a9fea042226963ccd0f7851030b3d6e282ccebaa17e');
k64.toString().should.equal('IoP+EbmhibgvHAkgCAaSDL3Y73UvU96pEPkKtSb0Qazb1RKFVWR6fjkKGp/qBCImljzND3hRAws9bigszrqhfg==');
p.getBase64Async(pass, function(ret) {
ret.toString().should.equal('IoP+EbmhibgvHAkgCAaSDL3Y73UvU96pEPkKtSb0Qazb1RKFVWR6fjkKGp/qBCImljzND3hRAws9bigszrqhfg==');
done();
});
});
});
});

23
test/network.Async.js
View file

@ -62,7 +62,10 @@ describe('Network / Async', function() {
it('should be able to broadcast', function() {
var n = createN('9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08');
var spy = sinon.spy();
n.send(null, 'hello', spy);
var dummy = {
dummy: true
};
n.send(null, dummy, spy);
spy.calledOnce.should.be.true;
});
it('should call _sendToOne for a copayer', function(done) {
@ -128,7 +131,7 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
var enc = n1.encode(cid2, message);
n2._onMessage(enc);
@ -141,7 +144,7 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid3, // MITM
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
var enc = n.encode(cid2, message);
@ -161,7 +164,7 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
var nonce = new Buffer('0000000000000001', 'hex');
var enc = n1.encode(cid2, message, nonce);
@ -178,7 +181,7 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
n2.networkNonces = {};
n2.networkNonces[cid1] = new Buffer('5000000000000001', 'hex');
@ -198,7 +201,7 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
n2.networkNonces = {};
n2.networkNonces[cid1] = new Buffer('0000000000000002', 'hex');
@ -216,10 +219,10 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'mySecret'
secretNumber: 'mySecret'
};
var enc = n1.encode(cid2, message);
var enc = n1.encode(cid2, message);
n2._onMessage(enc);
n2._deletePeer.calledOnce.should.equal(false);
@ -233,10 +236,10 @@ describe('Network / Async', function() {
var message = {
type: 'hello',
copayerId: cid1,
secretNumber : 'otherSecret'
secretNumber: 'otherSecret'
};
var enc = n1.encode(cid2, message);
var enc = n1.encode(cid2, message);
n2._onMessage(enc);
n2._deletePeer.calledOnce.should.equal(true);