Separated client from index, added rest of API

lib/bitcoin/client.js

@@ -0,0 +1,74 @@
+
+var rpc = require('../jsonrpc');
+var _ = require('underscore')._;
+
+
+//===----------------------------------------------------------------------===//
+// jsonrpc wrappers
+//===----------------------------------------------------------------------===//
+var bitcoinAPI = {
+  backupWallet: 'backupwallet',
+  getBalance: 'getbalance',
+  getBlockCount: 'getblockcount',
+  getBlockNumber: 'getblocknumber',
+  getConnectionCount: 'getconnectioncount',
+  getDifficulty: 'getdifficulty',
+  getGenerate: 'getgenerate',
+  getHashesPerSecond: 'gethashespersec',
+  getInfo: 'getinfo',
+  getNewAddress: 'getnewaddress',
+  getReceivedByAccount: 'getreceivedbyaccount',
+  getReceivedByAddress: 'getreceivedbyaddress',
+  getTransaction: 'gettransaction',
+  getWork: 'getwork',
+  help: 'help',
+  listAccounts: 'listaccounts',
+  listReceivedByAccount: 'listreceivedbyaccount',
+  listReceivedByAddress: 'listreceivedbyaddress',
+  listTransactions: 'listtransactions',
+  move: 'move',
+  sendFrom: 'sendfrom',
+  sendToAddress: 'sendtoaddress',
+  setGenerate: 'setgenerate',
+  stop: 'stop',
+  validateAddress: 'validateaddress',
+};
+
+
+//===----------------------------------------------------------------------===//
+// Client
+//===----------------------------------------------------------------------===//
+function Client(host, port, user, pass) {
+  this.host = host;
+  this.port = port;
+  this.user = user;
+  this.pass = pass;
+
+  this.rpc = rpc.getClient(port, host, user, pass);
+}
+
+
+//===----------------------------------------------------------------------===//
+// Initialize wrappers
+//===----------------------------------------------------------------------===//
+(function() {
+  _.each(bitcoinAPI, function(jsonFn, protoFn) {
+    Client.prototype[protoFn] = function() {
+      var args = [].slice.call(arguments);
+      var fn = args[args.length-1];
+
+      // If the last function is a callback, pop it from the args list
+      if(_.isFunction(fn)) {
+        args.pop(); 
+      } else {
+        fn = function () {};
+      }
+
+      this.rpc.call(jsonFn, args, fn);
+    };
+  });
+})();
+
+
+// Export!
+module.exports = Client;

lib/bitcoin/index.js

@@ -1,68 +1,4 @@
 
-var rpc = require('../jsonrpc');
-var _ = require('underscore')._;
-
-
-//===----------------------------------------------------------------------===//
-// jsonrpc wrappers
-//===----------------------------------------------------------------------===//
-var bitcoinAPI = {
-  backupWallet: 'backupwallet',
-  getBalance: 'getbalance',
-  getBlockCount: 'getblockcount',
-  getBlockNumber: 'getblocknumber',
-  getConnectionCount: 'getconnectioncount',
-  getDifficulty: 'getdifficulty',
-  getGenerate: 'getgenerate',
-  getHashesPerSecond: 'gethashespersec',
-  getInfo: 'getinfo',
-  getNewAddress: 'getnewaddress',
-  getReceivedByAccount: 'getreceivedbyaccount',
-  listReceivedByAccount: 'listreceivedbyaccount',
-  getReceivedByAddress: 'getreceivedbyaddress',
-  listReceivedByAddress: 'listreceivedbyaddress',
-  getTransaction: 'gettransaction',
-  getWork: 'getwork',
-  setGenerate: 'setgenerate',
-  validateAddress: 'validateaddress',
-  help: 'help',
+module.exports = {
+  Client: require('./client.js'),
 };
-
-
-//===----------------------------------------------------------------------===//
-// Client
-//===----------------------------------------------------------------------===//
-function Client(host, port, user, pass) {
-  this.host = host;
-  this.port = port;
-  this.user = user;
-  this.pass = pass;
-
-  this.rpc = rpc.getClient(port, host, user, pass);
-}
-
-
-//===----------------------------------------------------------------------===//
-// Initialize wrappers
-//===----------------------------------------------------------------------===//
-(function() {
-  _.each(bitcoinAPI, function(jsonFn, protoFn) {
-    Client.prototype[protoFn] = function() {
-      var args = [].slice.call(arguments);
-      var fn = args[args.length-1];
-
-      // If the last function is a callback, pop it from the args list
-      if(_.isFunction(fn)) {
-        args.pop(); 
-      } else {
-        fn = function () {};
-      }
-
-      this.rpc.call(jsonFn, args, fn);
-    };
-  });
-})();
-
-
-// Export!
-module.exports = Client;