remove useless Address dependency from Keypair
to get an address from a key, just do Address().fromPubkey(key.pubkey)
This commit is contained in:
parent
47b48bd5c7
commit
c59013eb46
|
@ -1,4 +1,3 @@
|
||||||
var Address = require('../lib/address');
|
|
||||||
var Privkey = require('./privkey');
|
var Privkey = require('./privkey');
|
||||||
var Pubkey = require('./pubkey');
|
var Pubkey = require('./pubkey');
|
||||||
var BN = require('./bn');
|
var BN = require('./bn');
|
||||||
|
@ -41,10 +40,6 @@ Key.prototype.fromString = function(str) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Key.prototype.getAddress = function(networkstr) {
|
|
||||||
return Address().fromPubkey(this.pubkey, networkstr);
|
|
||||||
};
|
|
||||||
|
|
||||||
Key.prototype.privkey2pubkey = function() {
|
Key.prototype.privkey2pubkey = function() {
|
||||||
this.pubkey = Pubkey().fromPrivkey(this.privkey);
|
this.pubkey = Pubkey().fromPrivkey(this.privkey);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var should = require('chai').should();
|
var should = require('chai').should();
|
||||||
var bn = require('../lib/bn');
|
var bn = require('../lib/bn');
|
||||||
var point = require('../lib/point');
|
var point = require('../lib/point');
|
||||||
var Address = require('../lib/address');
|
|
||||||
var Privkey = require('../lib/privkey');
|
var Privkey = require('../lib/privkey');
|
||||||
var Pubkey = require('../lib/pubkey');
|
var Pubkey = require('../lib/pubkey');
|
||||||
var Keypair = require('../lib/keypair');
|
var Keypair = require('../lib/keypair');
|
||||||
|
@ -94,19 +93,6 @@ describe('Keypair', function() {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('#getAddress', function() {
|
|
||||||
|
|
||||||
it('should return an address', function() {
|
|
||||||
var privhex = '906977a061af29276e40bf377042ffbde414e496ae2260bbf1fa9d085637bfff';
|
|
||||||
var pubhex = '02a1633cafcc01ebfb6d78e39f687a1f0995c62fc95f51ead10a02ee0be551b5dc';
|
|
||||||
var key = new Keypair();
|
|
||||||
key.privkey = new Privkey({bn: bn(new Buffer(privhex, 'hex'))});
|
|
||||||
key.privkey2pubkey();
|
|
||||||
key.getAddress().toString().should.equal((new Address()).fromPubkey(key.pubkey).toString());
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("#privkey2pubkey", function() {
|
describe("#privkey2pubkey", function() {
|
||||||
|
|
||||||
it('should convert this known Privkey to known Pubkey', function() {
|
it('should convert this known Privkey to known Pubkey', function() {
|
||||||
|
|
Loading…
Reference in New Issue