Bitmessage/bitmessage-js
2
0
Fork 1
Code Issues 1 Pull Requests 1 Actions Packages Releases Activity

s/ripelen/ripeLength/ option to be consistent

Browse Source
This commit is contained in:
Kagami Hiiragi 2015-01-23 18:29:39 +03:00
parent d50dcac4a2
commit 643edbbdc6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/address.js
View File

@ -206,7 +206,7 @@ Address.prototype.encode = function() {
Address.fromRandom = function(opts) { Address.fromRandom = function(opts) {
opts = objectAssign({}, opts); opts = objectAssign({}, opts);
var version = opts.version = opts.version || 4; var version = opts.version = opts.version || 4;
var ripelen = popkey(opts, "ripelen") || 19; var ripelen = popkey(opts, "ripeLength") || 19;
assertripelen(ripelen, version); assertripelen(ripelen, version);
// TODO(Kagami): Speed it up using web workers in Browser. // TODO(Kagami): Speed it up using web workers in Browser.
@ -242,7 +242,7 @@ Address.fromPassphrase = function(opts) {
opts = objectAssign({}, opts); opts = objectAssign({}, opts);
} }
var version = opts.version = opts.version || 4; var version = opts.version = opts.version || 4;
var ripelen = popkey(opts, "ripelen") || 19; var ripelen = popkey(opts, "ripeLength") || 19;
assertripelen(ripelen, version); assertripelen(ripelen, version);
var passphrase = popkey(opts, "passphrase"); var passphrase = popkey(opts, "passphrase");

9
test.js
View File

@ -523,6 +523,7 @@ describe("Object types", function() {
expect(bufferEqual(res.encPublicKey, encPublicKey)).to.be.true; expect(bufferEqual(res.encPublicKey, encPublicKey)).to.be.true;
expect(res.nonceTrialsPerByte).to.equal(1000); expect(res.nonceTrialsPerByte).to.equal(1000);
expect(res.payloadLengthExtraBytes).to.equal(1000); expect(res.payloadLengthExtraBytes).to.equal(1000);
expect(Buffer.isBuffer(res.signature)).to.be.true;
}); });
}); });
@ -540,6 +541,7 @@ describe("Object types", function() {
expect(bufferEqual(res.encPublicKey, encPublicKey)).to.be.true; expect(bufferEqual(res.encPublicKey, encPublicKey)).to.be.true;
expect(res.nonceTrialsPerByte).to.equal(1000); expect(res.nonceTrialsPerByte).to.equal(1000);
expect(res.payloadLengthExtraBytes).to.equal(1000); expect(res.payloadLengthExtraBytes).to.equal(1000);
expect(Buffer.isBuffer(res.signature)).to.be.true;
expect(bufferEqual(res.tag, from.getTag())).to.be.true; expect(bufferEqual(res.tag, from.getTag())).to.be.true;
}); });
}); });
@ -685,6 +687,11 @@ describe("High-level classes", function() {
expect(addr.getPubkeyPrivateKey().toString("hex")).to.equal("15e516173769dc87d4a8e8ed90200362fa58c0228bb2b70b06f26c089a9823a4"); expect(addr.getPubkeyPrivateKey().toString("hex")).to.equal("15e516173769dc87d4a8e8ed90200362fa58c0228bb2b70b06f26c089a9823a4");
}); });
it("should calculate a private key to encrypt broadcast object", function() {
var addr = Address.decode("BM-2cTux3PGRqHTEH6wyUP2sWeT4LrsGgy63z");
expect(addr.getBroadcastPrivateKey().toString("hex")).to.equal("15e516173769dc87d4a8e8ed90200362fa58c0228bb2b70b06f26c089a9823a4");
});
it("should allow to decode Address instance", function() { it("should allow to decode Address instance", function() {
var addr = Address.decode("2cTux3PGRqHTEH6wyUP2sWeT4LrsGgy63z"); var addr = Address.decode("2cTux3PGRqHTEH6wyUP2sWeT4LrsGgy63z");
expect(addr.ripe.toString("hex")).to.equal("003ab6655de4bd8c603eba9b00dd5970725fdd56"); expect(addr.ripe.toString("hex")).to.equal("003ab6655de4bd8c603eba9b00dd5970725fdd56");
@ -717,7 +724,7 @@ describe("High-level classes", function() {
if (allTests && typeof window === "undefined") { if (allTests && typeof window === "undefined") {
it("should allow to generate shorter address", function() { it("should allow to generate shorter address", function() {
this.timeout(300000); this.timeout(300000);
var addr = Address.fromRandom({ripelen: 18}); var addr = Address.fromRandom({ripeLength: 18});
var ripe = addr.getRipe({short: true}); var ripe = addr.getRipe({short: true});
expect(ripe.length).to.be.at.most(18); expect(ripe.length).to.be.at.most(18);
}); });