Merge pull request #173 from matiu/feature/peer-authentication

Feature/peer authentication
This commit is contained in:
Ryan X. Charles 2014-04-24 12:35:58 -03:00
commit 486685f757
9 changed files with 279 additions and 155 deletions

View file

@ -70,7 +70,7 @@ describe('PrivateKey model', function() {
it('should calculate .id', function () {
var w1 = new PrivateKey(config);
should.exist(w1.getId());
w1.getId().length.should.equal(32);
w1.getId().length.should.equal(66);
});
it('fromObj toObj roundtrip', function () {
var w1 = new PrivateKey(config);

View file

@ -228,7 +228,7 @@ describe('PublicKeyRing model', function() {
networkName: 'livenet',
});
wx.addCopayer();
(function() { w.merge(wx, true);}).should.throw();
(function() { w.merge(wx);}).should.throw();
});