Merge pull request from dcousens/removeexport

Removes deprecated ECKey.export function
This commit is contained in:
Wei Lu 2014-03-29 19:24:54 +08:00
commit db35a84a80
4 changed files with 7 additions and 20 deletions

View file

@ -59,14 +59,6 @@ ECKey.prototype.getPub = function(compressed) {
return ECPubKey(ecparams.getG().multiply(this.priv),compressed)
}
/**
* @deprecated Reserved keyword, factory pattern. Use toHex, toBytes, etc.
*/
ECKey.prototype['export'] = function(format) {
var format = format || 'hex'
return this['to' + format.substr(0, 1).toUpperCase() + format.substr(1)]()
}
ECKey.prototype.toBin = function() {
return convert.bytesToString(this.toBytes())
}
@ -154,11 +146,6 @@ ECPubKey.prototype.multiply = function(key) {
return ECPubKey(this.pub.multiply(ECKey(key).priv),this.compressed)
}
ECPubKey.prototype['export'] = function(format) {
var format = format || 'hex';
return this['to' + format.substr(0, 1).toUpperCase() + format.substr(1)]()
}
ECPubKey.prototype.toBytes = function(compressed) {
if (compressed === undefined) compressed = this.compressed
return this.pub.getEncoded(compressed)

View file

@ -310,12 +310,12 @@ Transaction.prototype.sign = function(index, key, type) {
// TODO: getPub is slow, sha256ripe160 probably is too.
// This could be sped up a lot by providing these as inputs.
var pub = key.getPub().export('bytes'),
var pub = key.getPub().toBytes(),
hash160 = util.sha256ripe160(pub),
script = Script.createOutputScript(new Address(hash160)),
hash = this.hashTransactionForSignature( script, index, type),
hash = this.hashTransactionForSignature(script, index, type),
sig = key.sign(hash).concat([type]);
this.ins[index].script = Script.createInputScript(sig,pub);
this.ins[index].script = Script.createInputScript(sig, pub);
}
// Takes outputs of the form [{ output: 'txhash:index', address: 'address' },...]