From 729aea3b4166d9a7c9bd3b61bf26541039232746 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 19 Nov 2016 02:47:44 -0800 Subject: [PATCH] utils: mark circular. --- lib/crypto/crypto.js | 6 +++--- lib/crypto/pk-browser.js | 2 +- lib/crypto/pk.js | 2 +- lib/utils/asn1.js | 2 +- lib/utils/co.js | 10 +++++----- lib/utils/utils.js | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/crypto/crypto.js b/lib/crypto/crypto.js index 2394ad78..aac0cef5 100644 --- a/lib/crypto/crypto.js +++ b/lib/crypto/crypto.js @@ -642,7 +642,7 @@ crypto.randomRange = function randomRange(min, max) { lazy('aes', './aes'); lazy('chachapoly', './chachapoly'); -lazy('ec', './ec'); -lazy('schnorr', './schnorr'); +lazy('ec', './ec'); // ec-secp256k1 - circular +lazy('schnorr', './schnorr'); // circular lazy('siphash', './siphash'); -lazy('pk', './pk'); +lazy('pk', './pk'); // circular diff --git a/lib/crypto/pk-browser.js b/lib/crypto/pk-browser.js index 34262bcd..02f7b080 100644 --- a/lib/crypto/pk-browser.js +++ b/lib/crypto/pk-browser.js @@ -10,7 +10,7 @@ var assert = require('assert'); var BN = require('bn.js'); var ASN1 = require('../utils/asn1'); var elliptic = require('elliptic'); -var crypto = require('../crypto/crypto'); +var crypto = require('./crypto'); var dsa, rsa, ecdsa; /* diff --git a/lib/crypto/pk.js b/lib/crypto/pk.js index b037a4f3..4decbd7b 100644 --- a/lib/crypto/pk.js +++ b/lib/crypto/pk.js @@ -9,7 +9,7 @@ var assert = require('assert'); var PEM = require('../utils/pem'); var elliptic = require('elliptic'); -var crypto = require('../crypto/crypto'); +var crypto = require('./crypto'); var nodeCrypto = require('crypto'); var dsa, rsa, ecdsa; diff --git a/lib/utils/asn1.js b/lib/utils/asn1.js index 4c764613..7acab5eb 100644 --- a/lib/utils/asn1.js +++ b/lib/utils/asn1.js @@ -30,7 +30,7 @@ 'use strict'; var assert = require('assert'); -var BufferReader = require('../utils/reader'); +var BufferReader = require('./reader'); var ASN1 = exports; ASN1.parseTag = function parseTag(p) { diff --git a/lib/utils/co.js b/lib/utils/co.js index 84f3f767..80794f38 100644 --- a/lib/utils/co.js +++ b/lib/utils/co.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var nextTick = require('./nexttick'); var every; /** @@ -151,7 +151,7 @@ function con(generator) { return exec(gen).catch(function(err) { // Escape the promise's scope: - utils.nextTick(function() { + nextTick(function() { callback(err); }); }); @@ -167,11 +167,11 @@ function con(generator) { function cb(promise, callback) { promise.then(function(value) { - utils.nextTick(function() { + nextTick(function() { callback(null, value); }); }, function(err) { - utils.nextTick(function() { + nextTick(function() { callback(err); }); }); @@ -184,7 +184,7 @@ function cb(promise, callback) { function wait() { return new Promise(function(resolve, reject) { - utils.nextTick(resolve); + nextTick(resolve); }); }; diff --git a/lib/utils/utils.js b/lib/utils/utils.js index 963be6b7..94d1d14a 100644 --- a/lib/utils/utils.js +++ b/lib/utils/utils.js @@ -1954,18 +1954,18 @@ utils.lazy = require('./lazy'); lazy = utils.lazy(require, exports); -lazy('AsyncObject', './async'); +lazy('AsyncObject', './async'); // circular - inherits lazy('bloom', './bloom'); -lazy('errors', './errors'); +lazy('errors', './errors'); // circular - inherits/btc lazy('ip', './ip'); -lazy('Locker', './locker'); +lazy('Locker', './locker'); // circular - inherits lazy('LRU', './lru'); lazy('murmur3', './murmur3'); lazy('co', './co'); -lazy('uri', './uri'); -lazy('BufferReader', './reader'); -lazy('BufferWriter', './writer'); -lazy('protobuf', './protobuf'); +lazy('uri', './uri'); // circular - satoshi/btc/isNumber +lazy('BufferReader', './reader'); // circular - serialization +lazy('BufferWriter', './writer'); // circular - serialization +lazy('protobuf', './protobuf'); // circular - inherits lazy('pem', './pem'); lazy('asn1', './asn1'); lazy('nfkd', './nfkd');