From 098465c17162d00eb628f9aa40f4a351679a2fbd Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 19 Nov 2016 07:10:49 -0800 Subject: [PATCH] miner: rename. --- lib/env.js | 10 +++++----- lib/{miner => mining}/index.js | 0 lib/{miner => mining}/mine.js | 0 lib/{miner => mining}/miner.js | 0 lib/{miner => mining}/minerblock.js | 0 lib/node/fullnode.js | 2 +- lib/workers/jobs.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename lib/{miner => mining}/index.js (100%) rename lib/{miner => mining}/mine.js (100%) rename lib/{miner => mining}/miner.js (100%) rename lib/{miner => mining}/minerblock.js (100%) diff --git a/lib/env.js b/lib/env.js index 188e9f79..a5acb4c4 100644 --- a/lib/env.js +++ b/lib/env.js @@ -146,9 +146,9 @@ function Environment() { this.require('mempoolentry', './mempool/mempoolentry'); // Miner - this.require('mining', './miner'); // -> mining? - this.require('miner', './miner/miner'); - this.require('minerblock', './miner/minerblock'); + this.require('mining', './mining'); + this.require('miner', './mining/miner'); + this.require('minerblock', './mining/minerblock'); // Net this.require('net', './net'); @@ -158,6 +158,7 @@ function Environment() { this.require('packets', './net/packets'); this.require('peer', './net/peer'); this.require('pool', './net/pool'); + this.require('tcp', './net/tcp'); this.require('time', './net/time'); // Node @@ -168,8 +169,7 @@ function Environment() { this.require('spvnode', './node/spvnode'); // Primitives - this.require('primitives', './primitives'); // -> wire? - this.require('wire', './primitives'); + this.require('primitives', './primitives'); this.require('address', './primitives/address'); this.require('block', './primitives/block'); this.require('coin', './primitives/coin'); diff --git a/lib/miner/index.js b/lib/mining/index.js similarity index 100% rename from lib/miner/index.js rename to lib/mining/index.js diff --git a/lib/miner/mine.js b/lib/mining/mine.js similarity index 100% rename from lib/miner/mine.js rename to lib/mining/mine.js diff --git a/lib/miner/miner.js b/lib/mining/miner.js similarity index 100% rename from lib/miner/miner.js rename to lib/mining/miner.js diff --git a/lib/miner/minerblock.js b/lib/mining/minerblock.js similarity index 100% rename from lib/miner/minerblock.js rename to lib/mining/minerblock.js diff --git a/lib/node/fullnode.js b/lib/node/fullnode.js index 4e3f7a5c..51e43b12 100644 --- a/lib/node/fullnode.js +++ b/lib/node/fullnode.js @@ -15,7 +15,7 @@ var Chain = require('../chain/chain'); var Fees = require('../mempool/fees'); var Mempool = require('../mempool/mempool'); var Pool = require('../net/pool'); -var Miner = require('../miner/miner'); +var Miner = require('../mining/miner'); var WalletDB = require('../wallet/walletdb'); var HTTPServer = require('../http/server'); diff --git a/lib/workers/jobs.js b/lib/workers/jobs.js index 448a23e9..c03efa3b 100644 --- a/lib/workers/jobs.js +++ b/lib/workers/jobs.js @@ -8,7 +8,7 @@ var ec = require('../crypto/ec'); var scrypt = require('../crypto/scrypt'); -var mine = require('../miner/mine'); +var mine = require('../mining/mine'); /** * Jobs to execute within the worker.