From 557e9ae2a4cd671bbcd221f41da355b8a5abc0f8 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 10 Jul 2014 15:55:32 -0300 Subject: [PATCH] use node util.inherits --- lib/Address.js | 6 ++++-- lib/Connection.js | 3 ++- lib/PeerManager.js | 3 ++- lib/PrivateKey.js | 7 ++++--- lib/SIN.js | 6 ++++-- util/BinaryParser.js | 2 -- util/EncodedData.js | 6 ++---- util/VersionedData.js | 10 +++++----- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/lib/Address.js b/lib/Address.js index 835739a..58bc639 100644 --- a/lib/Address.js +++ b/lib/Address.js @@ -32,8 +32,10 @@ 'use strict'; var coinUtil = require('../util'); var VersionedData = require('../util/VersionedData'); +var EncodedData = require('../util/EncodedData'); var networks = require('../networks'); var Script = require('./Script'); +var util = require('util'); function Address(version, hash) { if (hash && hash.length && hash.length != 20) @@ -41,8 +43,8 @@ function Address(version, hash) { Address.super(this, arguments); } -Address.prototype = Object.create(VersionedData.prototype) -VersionedData.applyEncodingsTo(Address); +util.inherits(Address, VersionedData); +EncodedData.applyEncodingsTo(Address); // create a pubKeyHash address Address.fromPubKey = function(pubKey, network) { diff --git a/lib/Connection.js b/lib/Connection.js index b379e48..9698037 100644 --- a/lib/Connection.js +++ b/lib/Connection.js @@ -17,6 +17,7 @@ var buffertools = require('buffertools'); var doubleSha256 = util.twoSha256; var SecureRandom = require('./SecureRandom'); var nonce = SecureRandom.getPseudoRandomBuffer(8); +var nodeUtil = require('util'); var BIP0031_VERSION = 60000; @@ -61,7 +62,7 @@ function Connection(socket, peer, opts) { this.setupHandlers(); } var EventEmitter = require('events').EventEmitter; -Connection.prototype = Object.create(EventEmitter.prototype) +nodeUtil.inherits(Connection, EventEmitter); Connection.prototype.open = function(callback) { if (typeof callback === 'function') this.once('connect', callback); this.socket.connect(this.peer.port, this.peer.host); diff --git a/lib/PeerManager.js b/lib/PeerManager.js index c1cd1c1..4f8c7b3 100644 --- a/lib/PeerManager.js +++ b/lib/PeerManager.js @@ -5,6 +5,7 @@ var Peer = require('./Peer'); var async = require('async'); var dns = require('dns'); var networks = require('../networks'); +var util = require('util'); GetAdjustedTime = function() { // TODO: Implement actual adjustment @@ -40,7 +41,7 @@ function PeerManager(config) { } var EventEmitter = require('events').EventEmitter; -PeerManager.prototype = Object.create(EventEmitter.prototype) +util.inherits(PeerManager, EventEmitter); PeerManager.Connection = Connection; PeerManager.prototype.start = function() { diff --git a/lib/PrivateKey.js b/lib/PrivateKey.js index e5e0df5..3f41c19 100644 --- a/lib/PrivateKey.js +++ b/lib/PrivateKey.js @@ -1,6 +1,8 @@ var VersionedData = require('../util/VersionedData'); +var EncodedData = require('../util/EncodedData'); var networks = require('../networks'); +var util = require('util'); //compressed is true if public key is compressed; false otherwise function PrivateKey(version, buf, compressed) { @@ -8,9 +10,8 @@ function PrivateKey(version, buf, compressed) { if (compressed !== undefined) this.compressed(compressed); }; - -PrivateKey.prototype = Object.create(VersionedData.prototype) -VersionedData.applyEncodingsTo(PrivateKey); +util.inherits(PrivateKey, VersionedData); +EncodedData.applyEncodingsTo(PrivateKey); PrivateKey.prototype.validate = function() { this.doAsBinary(function() { diff --git a/lib/SIN.js b/lib/SIN.js index 26b180f..9b48bd7 100644 --- a/lib/SIN.js +++ b/lib/SIN.js @@ -1,4 +1,6 @@ var VersionedData = require('../util/VersionedData'); +var EncodedData = require('../util/EncodedData'); +var util = require('util'); function SIN(type, payload) { if (typeof type != 'number') { @@ -12,8 +14,8 @@ function SIN(type, payload) { this.payload(payload); }; -SIN.prototype = Object.create(VersionedData.prototype) -VersionedData.applyEncodingsTo(SIN); +util.inherits(SIN, VersionedData); +EncodedData.applyEncodingsTo(SIN); SIN.SIN_PERSIST_MAINNET = 0x01; // associated with sacrifice TX SIN.SIN_PERSIST_TESTNET = 0x11; // associated with sacrifice TX diff --git a/util/BinaryParser.js b/util/BinaryParser.js index a6ef0be..0aa0b49 100644 --- a/util/BinaryParser.js +++ b/util/BinaryParser.js @@ -2,8 +2,6 @@ * Simple synchronous parser based on node-binary. */ -var imports = require('soop').imports(); - function Parser(buffer) { this.subject = buffer; this.pos = 0; diff --git a/util/EncodedData.js b/util/EncodedData.js index 6e1bb6b..a4ee47e 100644 --- a/util/EncodedData.js +++ b/util/EncodedData.js @@ -1,6 +1,4 @@ -var imports = require('soop').imports(); -var base58 = imports.base58 || require('../lib/Base58').base58Check; - +var base58 = require('../lib/Base58').base58Check; // Constructor. Takes the following forms: // new EncodedData() @@ -32,7 +30,7 @@ EncodedData.prototype.withEncoding = function(encoding) { // answer the data in the given encoding EncodedData.prototype.as = function(encoding) { - if (!encodings[encoding]) throw new Error('invalid encoding'); + if (!encodings[encoding]) throw new Error('invalid encoding: '+encoding); return this.converters[encoding].call(this); }; diff --git a/util/VersionedData.js b/util/VersionedData.js index dcff86c..e3d6031 100644 --- a/util/VersionedData.js +++ b/util/VersionedData.js @@ -1,6 +1,6 @@ -var imports = require('soop').imports(); -var base58 = imports.base58 || require('../lib/Base58').base58Check; -var parent = imports.parent || require('./EncodedData'); +var base58 = require('../lib/Base58').base58Check; +var util = require('util'); +var EncodedData = require('./EncodedData'); function VersionedData(version, payload) { @@ -14,8 +14,8 @@ function VersionedData(version, payload) { this.payload(payload); }; -VersionedData.parent = parent; -parent.applyEncodingsTo(VersionedData); +util.inherits(VersionedData, EncodedData); +EncodedData.applyEncodingsTo(VersionedData); // get or set the version data (the first byte of the address) VersionedData.prototype.version = function(num) {