diff --git a/src/js/account.js b/src/js/account.js index 5e782905..603ad7d1 100644 --- a/src/js/account.js +++ b/src/js/account.js @@ -12,12 +12,15 @@ // var network = require("./network.js"); var EventEmitter = require('events').EventEmitter; +var util = require('util'); + var Amount = require('./amount').Amount; var UInt160 = require('./uint160').UInt160; var extend = require('extend'); var Account = function (remote, account) { + EventEmitter.call(this); var self = this; this._remote = remote; @@ -73,7 +76,7 @@ var Account = function (remote, account) { return this; }; -Account.prototype = new EventEmitter; +util.inherits(Account, EventEmitter); /** * List of events that require a remote subscription to the account. diff --git a/src/js/orderbook.js b/src/js/orderbook.js index 57846bd2..70baa4d5 100644 --- a/src/js/orderbook.js +++ b/src/js/orderbook.js @@ -9,6 +9,8 @@ // var network = require("./network.js"); var EventEmitter = require('events').EventEmitter; +var util = require('util'); + var Amount = require('./amount').Amount; var UInt160 = require('./uint160').UInt160; var Currency = require('./currency').Currency; @@ -18,6 +20,8 @@ var extend = require('extend'); var OrderBook = function (remote, currency_gets, issuer_gets, currency_pays, issuer_pays) { + EventEmitter.call(this); + var self = this; this._remote = remote; @@ -70,7 +74,7 @@ var OrderBook = function (remote, return this; }; -OrderBook.prototype = new EventEmitter; +util.inherits(OrderBook, EventEmitter); /** * List of events that require a remote subscription to the orderbook. diff --git a/src/js/remote.js b/src/js/remote.js index e57e2f54..94181346 100644 --- a/src/js/remote.js +++ b/src/js/remote.js @@ -16,6 +16,8 @@ // npm var EventEmitter = require('events').EventEmitter; +var util = require('util'); + var Server = require('./server').Server; var Amount = require('./amount').Amount; var Currency = require('./currency').Currency; @@ -36,6 +38,8 @@ var sjcl = require('../../build/sjcl'); // 'remoteUnexpected' // 'remoteDisconnected' var Request = function (remote, command) { + EventEmitter.call(this); + var self = this; this.message = { @@ -46,7 +50,7 @@ var Request = function (remote, command) { this.requested = false; }; -Request.prototype = new EventEmitter; +util.inherits(Request, EventEmitter); // Send the request to a remote. Request.prototype.request = function (remote) { @@ -257,6 +261,8 @@ Request.prototype.books = function (books, snapshot) { // --> trusted: truthy, if remote is trusted var Remote = function (opts, trace) { + EventEmitter.call(this); + var self = this; this.trusted = opts.trusted; @@ -362,7 +368,7 @@ var Remote = function (opts, trace) { }); }; -Remote.prototype = new EventEmitter; +util.inherits(Remote, EventEmitter); Remote.from_config = function (obj, trace) { var serverConfig = 'string' === typeof obj ? config.servers[obj] : obj; diff --git a/src/js/server.js b/src/js/server.js index 67fae8ac..22dcacfa 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -1,9 +1,12 @@ var EventEmitter = require('events').EventEmitter; +var util = require('util'); var utils = require('./utils'); var Server = function (remote, cfg) { + EventEmitter.call(this); + if ("object" !== typeof cfg || "string" !== typeof cfg.url) { throw new Error("Invalid server configuration."); } @@ -25,7 +28,7 @@ var Server = function (remote, cfg) this.on('response_subscribe', this._handle_response_subscribe.bind(this)); }; -Server.prototype = new EventEmitter; +util.inherits(Server, EventEmitter); /** * Server states that we will treat as the server being online. diff --git a/src/js/transaction.js b/src/js/transaction.js index c838d212..06189c6d 100644 --- a/src/js/transaction.js +++ b/src/js/transaction.js @@ -43,13 +43,15 @@ // - may or may not forward. // +var EventEmitter = require('events').EventEmitter; +var util = require('util'); + var sjcl = require('../../build/sjcl'); var Amount = require('./amount').Amount; var Currency = require('./amount').Currency; var UInt160 = require('./amount').UInt160; var Seed = require('./seed').Seed; -var EventEmitter = require('events').EventEmitter; var SerializedObject = require('./serializedobject').SerializedObject; var config = require('./config'); @@ -61,6 +63,8 @@ var SUBMIT_LOST = 8; // Give up tracking. // - Collects parameters // - Allow event listeners to be attached to determine the outcome. var Transaction = function (remote) { + EventEmitter.call(this); + // YYY Make private as many variables as possible. var self = this; @@ -98,7 +102,7 @@ var Transaction = function (remote) { }); }; -Transaction.prototype = new EventEmitter; +util.inherits(Transaction, EventEmitter); // XXX This needs to be determined from the network. Transaction.fees = {