remove soop imports

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)

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) {

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)

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);
   }
 

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

lib/ECIES.js

@@ -1,5 +1,4 @@
 'use strict';
-var imports = require('soop').imports();
 var crypto = require('crypto');
 var ECIES = require('./common/ECIES');
 

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);

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() {};
 

lib/Opcode.js

@@ -1,5 +1,3 @@
-var imports = require('soop').imports();
-
 function Opcode(num) {
   this.code = num;
 };

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');
 

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) {

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;

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

lib/PrivateKey.js

@@ -1,4 +1,3 @@
-var imports = require('soop').imports();
 
 var VersionedData = require('../util/VersionedData');
 var networks = require('../networks');

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 || {};

lib/SIN.js

@@ -1,4 +1,3 @@
-var imports = require('soop').imports();
 var VersionedData = require('../util/VersionedData');
 
 function SIN(type, payload) {

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;

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');
 

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');
 

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);

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

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 = {

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');

lib/browser/ECIES.js

@@ -1,5 +1,4 @@
 'use strict';
-var imports = require('soop').imports();
 var sjcl = require('../sjcl');
 var ECIES = require('../common/ECIES');
 

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;

lib/browser/SecureRandom.js

@@ -1,5 +1,3 @@
-var imports = require('soop');
-
 var SecureRandom = require('../common/SecureRandom');
 
 SecureRandom.getRandomBuffer = function(size) {

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() {};

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 */