Merge pull request #41 from ajp8164/master

Rename cleanup

bin/btcnode

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-var btc = require('../lib/cli/btc');
-btc();
+var btcnode = require('../lib/cli/btcnode');
+btcnode();

docs/services.md

@@ -33,12 +33,12 @@ _Note:_ If you already have a btc-node database, and you want to query data from
 If, instead, you would like to run a custom node, you can include services by including them in your configuration object when initializing a new node.
 
 ```js
-//Require btc
-var btc = require('btc-node');
+//Require btcNode
+var btcNode = require('btc-node');
 
 //Services
-var Bitcoin = btc.services.Bitcoin;
-var Web = btc.services.Web;
+var Bitcoin = btcNode.services.Bitcoin;
+var Web = btcNode.services.Web;
 
 var myNode = new btc.Node({
   network: 'regtest'

index.js

@@ -21,7 +21,7 @@ module.exports.scaffold.defaultConfig = require('./lib/scaffold/default-config')
 module.exports.cli = {};
 module.exports.cli.main = require('./lib/cli/main');
 module.exports.cli.daemon = require('./lib/cli/daemon');
-module.exports.cli.btc = require('./lib/cli/btc');
-module.exports.cli.btcd = require('./lib/cli/btcd');
+module.exports.cli.btcnode = require('./lib/cli/btcnode');
+module.exports.cli.btcnoded = require('./lib/cli/btcnoded');
 
 module.exports.lib = require('btc-lib');

lib/cli/btcd.js → lib/cli/btcnoded.js

@@ -5,10 +5,10 @@ var Liftoff = require('liftoff');
 function main(parentServicesPath, additionalServices) {
 
   var liftoff = new Liftoff({
-    name: 'btcd',
+    name: 'btcnoded',
     moduleName: 'btc-node',
     configName: 'btc-node',
-    processTitle: 'btcd'
+    processTitle: 'btcnoded'
   }).on('require', function (name) {
     console.log('Loading:', name);
   }).on('requireFail', function (name, err) {

lib/cli/daemon.js

@@ -2,15 +2,15 @@
 
 var program = require('commander');
 var path = require('path');
-var btc = require('..');
+var btcNode = require('..');
 
 function main(servicesPath, additionalServices) {
   /* jshint maxstatements: 100 */
 
-  var version = btc.version;
-  var start = btc.scaffold.start;
-  var findConfig = btc.scaffold.findConfig;
-  var defaultConfig = btc.scaffold.defaultConfig;
+  var version = btcNode.version;
+  var start = btcNode.scaffold.start;
+  var findConfig = btcNode.scaffold.findConfig;
+  var defaultConfig = btcNode.scaffold.defaultConfig;
 
   program
     .version(version)

lib/logger.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var btc = require('btc-lib');
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var _ = btcLib.deps._;
 var colors = require('colors/safe');
 
 /**

lib/node.js

@@ -3,10 +3,10 @@
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 var async = require('async');
-var btc = require('btc-lib');
-var Networks = btc.Networks;
-var $ = btc.util.preconditions;
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var Networks = btcLib.Networks;
+var $ = btcLib.util.preconditions;
+var _ = btcLib.deps._;
 var index = require('./');
 var log = index.log;
 var Bus = require('./bus');

lib/scaffold/add.js

@@ -4,10 +4,10 @@ var async = require('async');
 var fs = require('fs');
 var path = require('path');
 var spawn = require('child_process').spawn;
-var btc = require('btc-lib');
+var btcLib = require('btc-lib');
 var utils = require('../utils');
-var $ = btc.util.preconditions;
-var _ = btc.deps._;
+var $ = btcLib.util.preconditions;
+var _ = btcLib.deps._;
 
 /**
  * @param {String} configFilePath - The absolute path to the configuration file
@@ -78,10 +78,10 @@ function add(options, done) {
   var configPath = options.path;
   var services = options.services;
 
-  var btcConfigPath = path.resolve(configPath, 'btc-node.json');
+  var btcNodeConfigPath = path.resolve(configPath, 'btc-node.json');
   var packagePath = path.resolve(configPath, 'package.json');
 
-  if (!fs.existsSync(btcConfigPath) || !fs.existsSync(packagePath)) {
+  if (!fs.existsSync(btcNodeConfigPath) || !fs.existsSync(packagePath)) {
     return done(
       new Error('Directory does not have a btc-node.json and/or package.json file.')
     );
@@ -109,7 +109,7 @@ function add(options, done) {
         var serviceName = newDependencies[0];
 
         // add service to btc-node.json
-        addConfig(btcConfigPath, serviceName, next);
+        addConfig(btcNodeConfigPath, serviceName, next);
       });
     }, done
   );

lib/scaffold/create.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var spawn = require('child_process').spawn;
-var btc = require('btc-lib');
+var btcLib = require('btc-lib');
 var async = require('async');
-var $ = btc.util.preconditions;
-var _ = btc.deps._;
+var $ = btcLib.util.preconditions;
+var _ = btcLib.deps._;
 var path = require('path');
 // var packageFile = require('../../package.json');
 var mkdirp = require('mkdirp');

lib/scaffold/find-config.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var btc = require('btc-lib');
-var $ = btc.util.preconditions;
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var $ = btcLib.util.preconditions;
+var _ = btcLib.deps._;
 var path = require('path');
 var fs = require('fs');
 var utils = require('../utils');

lib/scaffold/remove.js

@@ -4,9 +4,9 @@ var async = require('async');
 var fs = require('fs');
 var path = require('path');
 var spawn = require('child_process').spawn;
-var btc = require('btc-lib');
-var $ = btc.util.preconditions;
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var $ = btcLib.util.preconditions;
+var _ = btcLib.deps._;
 var utils = require('../utils');
 
 /**
@@ -100,10 +100,10 @@ function remove(options, done) {
   var configPath = options.path;
   var services = options.services;
 
-  var btcConfigPath = path.resolve(configPath, 'btc-node.json');
+  var btcNodeConfigPath = path.resolve(configPath, 'btc-node.json');
   var packagePath = path.resolve(configPath, 'package.json');
 
-  if (!fs.existsSync(btcConfigPath) || !fs.existsSync(packagePath)) {
+  if (!fs.existsSync(btcNodeConfigPath) || !fs.existsSync(packagePath)) {
     return done(
       new Error('Directory does not have a btc-node.json and/or package.json file.')
     );
@@ -118,7 +118,7 @@ function remove(options, done) {
           return next(err);
         }
         // remove service to btc-node.json
-        removeConfig(btcConfigPath, service, next);
+        removeConfig(btcNodeConfigPath, service, next);
       });
     }, done
   );

lib/scaffold/start.js

@@ -3,8 +3,8 @@
 var path = require('path');
 var BtcNode = require('../node');
 var index = require('../');
-var btc = require('btc-lib');
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var _ = btcLib.deps._;
 var log = index.log;
 var shuttingDown = false;
 

lib/services/bitcoind.js

@@ -4,14 +4,14 @@ var fs = require('fs');
 var path = require('path');
 var util = require('util');
 var mkdirp = require('mkdirp');
-var btc = require('btc-lib');
+var btcLib = require('btc-lib');
 var zmq = require('zeromq');
 var async = require('async');
 var LRU = require('lru-cache');
 var BitcoinRPC = require('bitcoind-rpc');
-var $ = btc.util.preconditions;
-var _  = btc.deps._;
-var Transaction = btc.Transaction;
+var $ = btcLib.util.preconditions;
+var _  = btcLib.deps._;
+var Transaction = btcLib.Transaction;
 
 var index = require('../');
 var errors = index.errors;
@@ -236,7 +236,7 @@ Bitcoin.prototype.subscribeAddress = function(emitter, addresses) {
   }
 
   for(var i = 0; i < addresses.length; i++) {
-    if (btc.Address.isValid(addresses[i], this.node.network)) {
+    if (btcLib.Address.isValid(addresses[i], this.node.network)) {
       addAddress(addresses[i]);
     }
   }
@@ -394,7 +394,7 @@ Bitcoin.prototype._checkConfigIndexes = function(spawnConfig, node) {
 
   $.checkState(
     spawnConfig.server && spawnConfig.server === 1,
-    '"server" option is required to communicate to bitcoind from btc. ' +
+    '"server" option is required to communicate to bitcoind from btc-node. ' +
       'Please add "server=1" to your configuration and restart'
   );
 
@@ -489,15 +489,15 @@ Bitcoin.prototype._getDefaultConf = function() {
   var networkOptions = {
     rpcport: 8332
   };
-  if (this.node.network === btc.Networks.testnet) {
+  if (this.node.network === btcLib.Networks.testnet) {
     networkOptions.rpcport = 18332;
   }
   return networkOptions;
 };
 
 Bitcoin.prototype._getNetworkConfigPath = function() {
   var networkPath;
-  if (this.node.network === btc.Networks.testnet) {
+  if (this.node.network === btcLib.Networks.testnet) {
     networkPath = 'testnet3/bitcoin.conf';
     if (this.node.network.regtestEnabled) {
       networkPath = 'regtest/bitcoin.conf';
@@ -508,7 +508,7 @@ Bitcoin.prototype._getNetworkConfigPath = function() {
 
 Bitcoin.prototype._getNetworkOption = function() {
   var networkOption;
-  if (this.node.network === btc.Networks.testnet) {
+  if (this.node.network === btcLib.Networks.testnet) {
     networkOption = '--testnet';
     if (this.node.network.regtestEnabled) {
       networkOption = '--regtest';
@@ -631,7 +631,7 @@ Bitcoin.prototype._notifyAddressTxidSubscribers = function(txid, transaction) {
 
 Bitcoin.prototype._zmqTransactionHandler = function(node, message) {
   var self = this;
-  var hash = btc.crypto.Hash.sha256sha256(message);
+  var hash = btcLib.crypto.Hash.sha256sha256(message);
   var id = hash.toString('binary');
   if (!self.zmqKnownTransactions.get(id)) {
     self.zmqKnownTransactions.set(id, true);
@@ -642,7 +642,7 @@ Bitcoin.prototype._zmqTransactionHandler = function(node, message) {
       this.subscriptions.rawtransaction[i].emit('bitcoind/rawtransaction', message.toString('hex'));
     }
 
-    var tx = btc.Transaction();
+    var tx = btcLib.Transaction();
     tx.fromString(message);
     var txid = tx.id;
     self._notifyAddressTxidSubscribers(txid, tx);
@@ -1058,7 +1058,7 @@ Bitcoin.prototype.getAddressUnspentOutputs = function(addressArg, options, callb
   var utxos = self.utxosCache.get(cacheKey);
 
   function transformUnspentOutput(delta) {
-    var script = btc.Script.fromAddress(delta.address);
+    var script = btcLib.Script.fromAddress(delta.address);
     return {
       address: delta.address,
       txid: delta.txid,
@@ -1349,7 +1349,7 @@ Bitcoin.prototype._getAddressStrings = function(addresses) {
   var addressStrings = [];
   for (var i = 0; i < addresses.length; i++) {
     var address = addresses[i];
-    if (address instanceof btc.Address) {
+    if (address instanceof btcLib.Address) {
       addressStrings.push(address.toString());
     } else if (_.isString(address)) {
       addressStrings.push(address);
@@ -1655,7 +1655,7 @@ Bitcoin.prototype.getBlock = function(blockArg, callback) {
           if (err) {
             return done(self._wrapRPCError(err));
           }
-          var blockObj = btc.Block.fromString(response.result);
+          var blockObj = btcLib.Block.fromString(response.result);
           self.blockCache.set(blockhash, blockObj);
           done(null, blockObj);
         });

lib/services/web.js

@@ -9,8 +9,8 @@ var socketio = require('socket.io');
 var inherits = require('util').inherits;
 
 var BaseService = require('../service');
-var btc = require('btc-lib');
-var _ = btc.deps._;
+var btcLib = require('btc-lib');
+var _ = btcLib.deps._;
 var index = require('../');
 var log = index.log;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "btc-node",
-  "description": "Bitcoin Core full node with extended capabilities using Btc.",
+  "description": "Bitcoin Core full node with extended capabilities.",
   "version": "0.0.1",
   "main": "./index.js",
   "repository": "git://github.com/owstack/btc-node.git",