From 6e346d067c9ad383e651b1ea2b37775c3d3420af Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 10 Jul 2014 12:39:09 -0300 Subject: [PATCH] remove soop imports --- lib/Address.js | 7 +++---- lib/BIP39.js | 5 ++--- lib/Block.js | 19 ++++++++----------- lib/Connection.js | 28 +++++++++++++--------------- lib/Curve.js | 5 ++--- lib/ECIES.js | 1 - lib/HierarchicalKey.js | 13 ++++++------- lib/Message.js | 5 ++--- lib/Opcode.js | 2 -- lib/PayPro.js | 1 - lib/Peer.js | 8 +++----- lib/PeerManager.js | 17 ++++++++--------- lib/Point.js | 5 ++--- lib/PrivateKey.js | 1 - lib/RpcClient.js | 7 +++---- lib/SIN.js | 1 - lib/Script.js | 16 +++++++--------- lib/ScriptInterpreter.js | 15 +++++++-------- lib/SecureRandom.js | 3 +-- lib/Transaction.js | 31 +++++++++++++++---------------- lib/TransactionBuilder.js | 23 +++++++++++------------ lib/Wallet.js | 4 +--- lib/WalletKey.js | 2 -- lib/browser/ECIES.js | 1 - lib/browser/Point.js | 5 ++--- lib/browser/SecureRandom.js | 2 -- lib/common/ECIES.js | 9 ++++----- lib/common/SecureRandom.js | 2 -- 28 files changed, 100 insertions(+), 138 deletions(-) diff --git a/lib/Address.js b/lib/Address.js index ae427295c..835739a16 100644 --- a/lib/Address.js +++ b/lib/Address.js @@ -30,11 +30,10 @@ 'use strict'; -var imports = require('soop').imports(); -var coinUtil = imports.coinUtil || require('../util'); +var coinUtil = require('../util'); var VersionedData = require('../util/VersionedData'); -var networks = imports.networks || require('../networks'); -var Script = imports.Script || require('./Script'); +var networks = require('../networks'); +var Script = require('./Script'); function Address(version, hash) { if (hash && hash.length && hash.length != 20) diff --git a/lib/BIP39.js b/lib/BIP39.js index 82802a6e3..ff4120a7b 100644 --- a/lib/BIP39.js +++ b/lib/BIP39.js @@ -1,6 +1,5 @@ -var imports = require('soop').imports(); -var coinUtil = imports.coinUtil || require('../util'); -var sjcl = imports.sjcl || require('./sjcl'); +var coinUtil = require('../util'); +var sjcl = require('./sjcl'); var SecureRandom = require('./SecureRandom'); var hmacSHA512 = function(key) { diff --git a/lib/Block.js b/lib/Block.js index bd36e8712..abbf0d871 100644 --- a/lib/Block.js +++ b/lib/Block.js @@ -1,17 +1,14 @@ -var imports = require('soop').imports(); - -var util = imports.util || require('../util'); -var Debug1 = imports.Debug1 || function() {}; -var Script = imports.Script || require('./Script'); -var Bignum = imports.Bignum || require('bignum'); -var Binary = imports.Binary || require('binary'); -var Step = imports.Step || require('step'); -var buffertools = imports.buffertools || require('buffertools'); -var Transaction = imports.Transaction || require('./Transaction'); +var util = require('../util'); +var Script = require('./Script'); +var Bignum = require('bignum'); +var Binary = require('binary'); +var Step = require('step'); +var buffertools = require('buffertools'); +var Transaction = require('./Transaction'); var TransactionIn = Transaction.In; var TransactionOut = Transaction.Out; var COINBASE_OP = Transaction.COINBASE_OP; -var VerificationError = imports.VerificationError || require('../util/error').VerificationError; +var VerificationError = require('../util/error').VerificationError; var BlockRules = { maxTimeOffset: 2 * 60 * 60, // How far block timestamps can be into the future largestHash: Bignum(2).pow(256) diff --git a/lib/Connection.js b/lib/Connection.js index 82191bda1..b379e4854 100644 --- a/lib/Connection.js +++ b/lib/Connection.js @@ -1,23 +1,21 @@ -var imports = require('soop').imports(); - -var log = imports.log || require('../util/log'); +var log = require('../util/log'); var MAX_RECEIVE_BUFFER = 10000000; var PROTOCOL_VERSION = 70000; -var Put = imports.Put || require('bufferput'); -var Buffers = imports.Buffers || require('buffers'); +var Put = require('bufferput'); +var Buffers = require('buffers'); require('../patches/Buffers.monkey').patch(Buffers); -var bitcoreDefaults = imports.config || require('../config'); -var networks = imports.networks || require('../networks'); -var Block = imports.Block || require('./Block'); -var Transaction = imports.Transaction || require('./Transaction'); -var util = imports.util || require('../util'); -var Parser = imports.Parser || require('../util/BinaryParser'); -var buffertools = imports.buffertools || require('buffertools'); -var doubleSha256 = imports.doubleSha256 || util.twoSha256; -var SecureRandom = imports.SecureRandom || require('./SecureRandom'); +var bitcoreDefaults = require('../config'); +var networks = require('../networks'); +var Block = require('./Block'); +var Transaction = require('./Transaction'); +var util = require('../util'); +var Parser = require('../util/BinaryParser'); +var buffertools = require('buffertools'); +var doubleSha256 = util.twoSha256; +var SecureRandom = require('./SecureRandom'); var nonce = SecureRandom.getPseudoRandomBuffer(8); var BIP0031_VERSION = 60000; @@ -33,7 +31,7 @@ function Connection(socket, peer, opts) { // check for socks5 proxy options and construct a proxied socket if (this.config.proxy) { - var Socks5Client = imports.Socks5Client || require('socks5-client'); + var Socks5Client = require('socks5-client'); this.socket = new Socks5Client(this.config.proxy.host, this.config.proxy.port); } diff --git a/lib/Curve.js b/lib/Curve.js index da2a13466..0e7ef3589 100644 --- a/lib/Curve.js +++ b/lib/Curve.js @@ -1,7 +1,6 @@ "use strict"; -var imports = require('soop'); -var bignum = imports.bignum || require('bignum'); -var Point = imports.Point || require('./Point'); +var bignum = require('bignum'); +var Point = require('./Point'); var n = bignum.fromBuffer(new Buffer("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 'hex'), { size: 32 diff --git a/lib/ECIES.js b/lib/ECIES.js index de06a7723..7403fb694 100644 --- a/lib/ECIES.js +++ b/lib/ECIES.js @@ -1,5 +1,4 @@ 'use strict'; -var imports = require('soop').imports(); var crypto = require('crypto'); var ECIES = require('./common/ECIES'); diff --git a/lib/HierarchicalKey.js b/lib/HierarchicalKey.js index 7e2bf1fad..86f7258c7 100644 --- a/lib/HierarchicalKey.js +++ b/lib/HierarchicalKey.js @@ -1,10 +1,9 @@ -var imports = require('soop').imports(); -var base58 = imports.base58 || require('./Base58').base58; -var coinUtil = imports.coinUtil || require('../util'); -var Key = imports.Key || require('./Key'); -var Point = imports.Point || require('./Point'); -var SecureRandom = imports.SecureRandom || require('./SecureRandom'); -var bignum = imports.bignum || require('bignum'); +var base58 = require('./Base58').base58; +var coinUtil = require('../util'); +var Key = require('./Key'); +var Point = require('./Point'); +var SecureRandom = require('./SecureRandom'); +var bignum = require('bignum'); var networks = require('../networks'); var secp256k1_n = new bignum('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16); diff --git a/lib/Message.js b/lib/Message.js index d1c8a7a92..36b198235 100644 --- a/lib/Message.js +++ b/lib/Message.js @@ -1,7 +1,6 @@ 'use strict'; -var imports = require('soop').imports(); -var coinUtil = imports.coinUtil || require('../util'); -var Key = imports.Key || require('./Key'); +var coinUtil = require('../util'); +var Key = require('./Key'); var Message = function() {}; diff --git a/lib/Opcode.js b/lib/Opcode.js index 4111e326a..0f9037cca 100644 --- a/lib/Opcode.js +++ b/lib/Opcode.js @@ -1,5 +1,3 @@ -var imports = require('soop').imports(); - function Opcode(num) { this.code = num; }; diff --git a/lib/PayPro.js b/lib/PayPro.js index 1a1623e06..fb1ed28f8 100644 --- a/lib/PayPro.js +++ b/lib/PayPro.js @@ -1,5 +1,4 @@ 'use strict'; -var imports = require('soop').imports(); var protobufjs = protobufjs || require('protobufjs/dist/ProtoBuf'); var Message = Message || require('./Message'); diff --git a/lib/Peer.js b/lib/Peer.js index 123ec65f3..c0528b344 100644 --- a/lib/Peer.js +++ b/lib/Peer.js @@ -1,8 +1,6 @@ -var imports = require('soop').imports(); - -var Net = imports.Net || require('net'); -var Binary = imports.Binary || require('binary'); -var buffertools = imports.buffertools || require('buffertools'); +var Net = require('net'); +var Binary = require('binary'); +var buffertools = require('buffertools'); function Peer(host, port, services) { if ("string" === typeof host) { diff --git a/lib/PeerManager.js b/lib/PeerManager.js index cb9da33b5..c1cd1c19e 100644 --- a/lib/PeerManager.js +++ b/lib/PeerManager.js @@ -1,10 +1,12 @@ -var imports = require('soop').imports(); -var log = imports.log || require('../util/log'); -var bitcoreDefaults = imports.config || require('../config'); -var Connection = imports.Connection || require('./Connection'); -var Peer = imports.Peer || require('./Peer'); +var log = require('../util/log'); +var bitcoreDefaults = require('../config'); +var Connection = require('./Connection'); +var Peer = require('./Peer'); +var async = require('async'); +var dns = require('dns'); +var networks = require('../networks'); -GetAdjustedTime = imports.GetAdjustedTime || function() { +GetAdjustedTime = function() { // TODO: Implement actual adjustment return Math.floor(new Date().getTime() / 1000); }; @@ -245,9 +247,6 @@ PeerManager.prototype.getActiveConnections = function() { PeerManager.prototype.discover = function(options, callback) { var self = this; - var async = imports.async || require('async'); - var dns = imports.dns || require('dns'); - var networks = imports.networks || require('../networks'); var seeds = networks[self.config.network].dnsSeeds; self.limit = options.limit || 12; diff --git a/lib/Point.js b/lib/Point.js index e3e57eb48..aec5e65d6 100644 --- a/lib/Point.js +++ b/lib/Point.js @@ -1,8 +1,7 @@ "use strict"; -var imports = require('soop').imports(); -var bignum = imports.bignum || require('bignum'); -var CPPKey = imports.CPPKey || require('bindings')('KeyModule').Key; +var bignum = require('bignum'); +var CPPKey = require('bindings')('KeyModule').Key; var assert = require('assert'); //a point on the secp256k1 curve diff --git a/lib/PrivateKey.js b/lib/PrivateKey.js index 47934b443..e5e0df551 100644 --- a/lib/PrivateKey.js +++ b/lib/PrivateKey.js @@ -1,4 +1,3 @@ -var imports = require('soop').imports(); var VersionedData = require('../util/VersionedData'); var networks = require('../networks'); diff --git a/lib/RpcClient.js b/lib/RpcClient.js index 62b9ce0a4..65f31399d 100644 --- a/lib/RpcClient.js +++ b/lib/RpcClient.js @@ -2,10 +2,9 @@ // MIT/X11-like license. See LICENSE.txt. // Copyright 2013 BitPay, Inc. // -var imports = require('soop').imports(); -var http = imports.http || require('http'); -var https = imports.https || require('https'); -var log = imports.log || require('../util/log'); +var http = require('http'); +var https = require('https'); +var log = require('../util/log'); function RpcClient(opts) { opts = opts || {}; diff --git a/lib/SIN.js b/lib/SIN.js index 4236893b4..26b180ffd 100644 --- a/lib/SIN.js +++ b/lib/SIN.js @@ -1,4 +1,3 @@ -var imports = require('soop').imports(); var VersionedData = require('../util/VersionedData'); function SIN(type, payload) { diff --git a/lib/Script.js b/lib/Script.js index f679a20cc..b1f8f1aa6 100644 --- a/lib/Script.js +++ b/lib/Script.js @@ -1,12 +1,10 @@ -var imports = require('soop').imports(); -var config = imports.config || require('../config'); -var log = imports.log || require('../util/log'); -var Opcode = imports.Opcode || require('./Opcode'); -var buffertools = imports.buffertools || require('buffertools'); - -var util = imports.util || require('../util/util'); -var Parser = imports.Parser || require('../util/BinaryParser'); -var Put = imports.Put || require('bufferput'); +var config = require('../config'); +var log = require('../util/log'); +var Opcode = require('./Opcode'); +var buffertools = require('buffertools'); +var util = require('../util/util'); +var Parser = require('../util/BinaryParser'); +var Put = require('bufferput'); var TX_UNKNOWN = 0; var TX_PUBKEY = 1; diff --git a/lib/ScriptInterpreter.js b/lib/ScriptInterpreter.js index 0763d0164..8bbe45c0e 100644 --- a/lib/ScriptInterpreter.js +++ b/lib/ScriptInterpreter.js @@ -1,11 +1,10 @@ -var imports = require('soop').imports(); -var config = imports.config || require('../config'); -var log = imports.log || require('../util/log'); -var util = imports.util || require('../util'); -var Opcode = imports.Opcode || require('./Opcode'); -var buffertools = imports.buffertools || require('buffertools'); -var bignum = imports.bignum || require('bignum'); -var Util = imports.Util || require('../util'); +var config = require('../config'); +var log = require('../util/log'); +var util = require('../util'); +var Opcode = require('./Opcode'); +var buffertools = require('buffertools'); +var bignum = require('bignum'); +var Util = require('../util'); var Script = require('./Script'); var Key = require('./Key'); diff --git a/lib/SecureRandom.js b/lib/SecureRandom.js index 73989362d..b24c7de6e 100644 --- a/lib/SecureRandom.js +++ b/lib/SecureRandom.js @@ -1,5 +1,4 @@ -var imports = require('soop'); -var crypto = imports.crypto || require('crypto'); +var crypto = require('crypto'); var SecureRandom = require('./common/SecureRandom'); diff --git a/lib/Transaction.js b/lib/Transaction.js index c39a2d369..75f4607dc 100644 --- a/lib/Transaction.js +++ b/lib/Transaction.js @@ -1,19 +1,18 @@ -var imports = require('soop').imports(); -var config = imports.config || require('../config'); -var log = imports.log || require('../util/log'); -var Address = imports.Address || require('./Address'); -var Script = imports.Script || require('./Script'); -var ScriptInterpreter = imports.ScriptInterpreter || require('./ScriptInterpreter'); -var util = imports.util || require('../util'); -var bignum = imports.bignum || require('bignum'); -var Put = imports.Put || require('bufferput'); -var Parser = imports.Parser || require('../util/BinaryParser'); -var Step = imports.Step || require('step'); -var buffertools = imports.buffertools || require('buffertools'); -var error = imports.error || require('../util/error'); -var networks = imports.networks || require('../networks'); -var WalletKey = imports.WalletKey || require('./WalletKey'); -var PrivateKey = imports.PrivateKey || require('./PrivateKey'); +var config = require('../config'); +var log = require('../util/log'); +var Address = require('./Address'); +var Script = require('./Script'); +var ScriptInterpreter = require('./ScriptInterpreter'); +var util = require('../util'); +var bignum = require('bignum'); +var Put = require('bufferput'); +var Parser = require('../util/BinaryParser'); +var Step = require('step'); +var buffertools = require('buffertools'); +var error = require('../util/error'); +var networks = require('../networks'); +var WalletKey = require('./WalletKey'); +var PrivateKey = require('./PrivateKey'); var COINBASE_OP = Buffer.concat([util.NULL_HASH, new Buffer('FFFFFFFF', 'hex')]); var FEE_PER_1000B_SAT = parseInt(0.0001 * util.COIN); diff --git a/lib/TransactionBuilder.js b/lib/TransactionBuilder.js index a16a33091..8227b1c75 100644 --- a/lib/TransactionBuilder.js +++ b/lib/TransactionBuilder.js @@ -52,19 +52,18 @@ 'use strict'; -var imports = require('soop').imports(); -var Address = imports.Address || require('./Address'); -var Script = imports.Script || require('./Script'); -var util = imports.util || require('../util'); -var bignum = imports.bignum || require('bignum'); -var buffertools = imports.buffertools || require('buffertools'); -var networks = imports.networks || require('../networks'); -var WalletKey = imports.WalletKey || require('./WalletKey'); -var PrivateKey = imports.PrivateKey || require('./PrivateKey'); -var Key = imports.Key || require('./Key'); -var log = imports.log || require('../util/log'); +var Address = require('./Address'); +var Script = require('./Script'); +var util = require('../util'); +var bignum = require('bignum'); +var buffertools = require('buffertools'); +var networks = require('../networks'); +var WalletKey = require('./WalletKey'); +var PrivateKey = require('./PrivateKey'); +var Key = require('./Key'); +var log = require('../util/log'); +var Transaction = require('./Transaction'); -var Transaction = imports.Transaction || require('./Transaction'); var FEE_PER_1000B_SAT = parseInt(0.0001 * util.COIN); // Methods diff --git a/lib/Wallet.js b/lib/Wallet.js index 45d87e51b..93e2851d4 100644 --- a/lib/Wallet.js +++ b/lib/Wallet.js @@ -1,5 +1,3 @@ -var imports = require('soop').imports(); - var hex = function(hex) { return new Buffer(hex, 'hex'); }; @@ -8,7 +6,7 @@ var fs = require('fs'); var EncFile = require('../util/EncFile'); var Address = require('./Address'); var networks = require('../networks'); -var util = imports.util || require('../util'); +var util = require('../util'); var ENC_METHOD = 'aes-256-cbc'; var skeleton = { diff --git a/lib/WalletKey.js b/lib/WalletKey.js index b4fda72c3..b7bf76f33 100644 --- a/lib/WalletKey.js +++ b/lib/WalletKey.js @@ -1,5 +1,3 @@ -var imports = require('soop').imports(); - var coinUtil = require('../util'); var timeUtil = require('../util/time'); var Key = require('./Key'); diff --git a/lib/browser/ECIES.js b/lib/browser/ECIES.js index ca89fa3c1..f83c5775a 100644 --- a/lib/browser/ECIES.js +++ b/lib/browser/ECIES.js @@ -1,5 +1,4 @@ 'use strict'; -var imports = require('soop').imports(); var sjcl = require('../sjcl'); var ECIES = require('../common/ECIES'); diff --git a/lib/browser/Point.js b/lib/browser/Point.js index d4a34a722..d18c5bde0 100644 --- a/lib/browser/Point.js +++ b/lib/browser/Point.js @@ -1,8 +1,7 @@ "use strict"; -var imports = require('soop').imports(); -var Key = imports.Key || require('./Key'); -var bignum = imports.bignum || require('bignum'); +var Key = require('./Key'); +var bignum = require('bignum'); var assert = require('assert'); var ECPointFp = require('../../browser/vendor-bundle.js').ECPointFp; var ECFieldElementFp = require('../../browser/vendor-bundle.js').ECFieldElementFp; diff --git a/lib/browser/SecureRandom.js b/lib/browser/SecureRandom.js index 79f1db50c..508efc305 100644 --- a/lib/browser/SecureRandom.js +++ b/lib/browser/SecureRandom.js @@ -1,5 +1,3 @@ -var imports = require('soop'); - var SecureRandom = require('../common/SecureRandom'); SecureRandom.getRandomBuffer = function(size) { diff --git a/lib/common/ECIES.js b/lib/common/ECIES.js index 3d25b03fc..adbef159b 100644 --- a/lib/common/ECIES.js +++ b/lib/common/ECIES.js @@ -1,9 +1,8 @@ 'use strict'; -var imports = require('soop').imports(); -var coinUtil = imports.coinUtil || require('../../util'); -var Point = imports.Point || require('../Point'); -var SecureRandom = imports.SecureRandom || require('../SecureRandom'); -var Key = imports.Key || require('../Key'); +var coinUtil = require('../../util'); +var Point = require('../Point'); +var SecureRandom = require('../SecureRandom'); +var Key = require('../Key'); // http://en.wikipedia.org/wiki/Integrated_Encryption_Scheme var ECIES = function() {}; diff --git a/lib/common/SecureRandom.js b/lib/common/SecureRandom.js index e6e8d8583..c49ce3cb5 100644 --- a/lib/common/SecureRandom.js +++ b/lib/common/SecureRandom.js @@ -1,5 +1,3 @@ -var imports = require('soop'); - var SecureRandom = function() {}; /* secure random bytes that sometimes throws an error due to lack of entropy */