From 9e724cabee86e470c171a42bd7d434fdf7132b78 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sat, 21 Feb 2015 11:59:33 -0300 Subject: [PATCH] default bit.dat file; --- bit-wallet/bit-address | 5 +---- bit-wallet/bit-addresses | 5 +---- bit-wallet/bit-balance | 5 +---- bit-wallet/bit-broadcast | 5 +---- bit-wallet/bit-confirm | 6 ++---- bit-wallet/bit-create | 4 +--- bit-wallet/bit-export | 5 +---- bit-wallet/bit-import | 7 +++---- bit-wallet/bit-join | 4 +--- bit-wallet/bit-recreate | 4 +--- bit-wallet/bit-reject | 5 +---- bit-wallet/bit-rm | 6 ++---- bit-wallet/bit-send | 6 +----- bit-wallet/bit-sign | 5 +---- bit-wallet/bit-status | 5 +---- bit-wallet/cli-utils.js | 11 ++++++++++- lib/client/api.js | 2 +- lib/client/filestorage.js | 5 ++++- 18 files changed, 34 insertions(+), 61 deletions(-) diff --git a/bit-wallet/bit-address b/bit-wallet/bit-address index 96c935f..0ffe053 100755 --- a/bit-wallet/bit-address +++ b/bit-wallet/bit-address @@ -3,12 +3,9 @@ var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .parse(process.argv); var args = program.args; diff --git a/bit-wallet/bit-addresses b/bit-wallet/bit-addresses index 9dee996..6d385f4 100755 --- a/bit-wallet/bit-addresses +++ b/bit-wallet/bit-addresses @@ -4,12 +4,9 @@ var _ = require('lodash'); var program = require('commander'); var utils = require('./cli-utils'); var Client = require('../lib/client'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .parse(process.argv); var args = program.args; diff --git a/bit-wallet/bit-balance b/bit-wallet/bit-balance index 8138188..173f038 100755 --- a/bit-wallet/bit-balance +++ b/bit-wallet/bit-balance @@ -3,12 +3,9 @@ var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .parse(process.argv); var args = program.args; diff --git a/bit-wallet/bit-broadcast b/bit-wallet/bit-broadcast index 44ec197..cb94701 100755 --- a/bit-wallet/bit-broadcast +++ b/bit-wallet/bit-broadcast @@ -4,12 +4,9 @@ var _ = require('lodash'); var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c,--config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v,--verbose', 'be verbose') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-confirm b/bit-wallet/bit-confirm index ba5534f..99d4386 100755 --- a/bit-wallet/bit-confirm +++ b/bit-wallet/bit-confirm @@ -4,13 +4,11 @@ var _ = require('lodash'); var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .parse(process.argv); + var client = utils.getClient(program); client.getStatus(function(err, x, myCopayerId) { diff --git a/bit-wallet/bit-create b/bit-wallet/bit-create index 696fffb..b4b052c 100755 --- a/bit-wallet/bit-create +++ b/bit-wallet/bit-create @@ -4,11 +4,9 @@ var _ = require('lodash'); var program = require('commander'); var ClientLib = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-t, --testnet', 'Create a Testnet Wallet') .usage('[options] [copayerName]') .parse(process.argv); diff --git a/bit-wallet/bit-export b/bit-wallet/bit-export index a9c3a46..3e876c8 100755 --- a/bit-wallet/bit-export +++ b/bit-wallet/bit-export @@ -5,12 +5,9 @@ var qr = require('qr-image'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .option('-q, --qr') .parse(process.argv); diff --git a/bit-wallet/bit-import b/bit-wallet/bit-import index 5f0d4e9..0b5f4f8 100755 --- a/bit-wallet/bit-import +++ b/bit-wallet/bit-import @@ -2,14 +2,13 @@ var program = require('commander'); var Client = require('../lib/client'); -var utils = require('./cli-utils'); - var fs = require('fs'); +var utils = require('./cli-utils'); +program = utils.configureCommander(program); + program .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-v, --verbose', 'be verbose') .usage('import [options] ') .parse(process.argv); diff --git a/bit-wallet/bit-join b/bit-wallet/bit-join index dc0d974..a4bc9a6 100755 --- a/bit-wallet/bit-join +++ b/bit-wallet/bit-join @@ -3,11 +3,9 @@ var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] [copayerName]') .parse(process.argv); diff --git a/bit-wallet/bit-recreate b/bit-wallet/bit-recreate index 3c035bc..dec0a17 100755 --- a/bit-wallet/bit-recreate +++ b/bit-wallet/bit-recreate @@ -4,11 +4,9 @@ var _ = require('lodash'); var program = require('commander'); var ClientLib = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] walletname') .description('Creates a wallet on the remove server given the local information') .parse(process.argv); diff --git a/bit-wallet/bit-reject b/bit-wallet/bit-reject index 5f99aea..de0858c 100755 --- a/bit-wallet/bit-reject +++ b/bit-wallet/bit-reject @@ -4,12 +4,9 @@ var _ = require('lodash'); var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c,--config [file]', 'Wallet config filename') - .option('-v,--verbose', 'be verbose') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] [reason]') .parse(process.argv); diff --git a/bit-wallet/bit-rm b/bit-wallet/bit-rm index 5e7e7d5..a27a787 100755 --- a/bit-wallet/bit-rm +++ b/bit-wallet/bit-rm @@ -4,12 +4,10 @@ var _ = require('lodash'); var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c,--config [file]', 'Wallet config filename') - .option('-v,--verbose', 'be verbose') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-send b/bit-wallet/bit-send index 794eea5..b8b8194 100755 --- a/bit-wallet/bit-send +++ b/bit-wallet/bit-send @@ -3,12 +3,9 @@ var program = require('commander'); var Client = require('../lib/client'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .usage('[options]
[note]') .description('Create a proposal for sending bitcoins to a destination address.\n The amount can be specified in bit, btc or sat (the default).'); @@ -19,7 +16,6 @@ program.on('--help', function(){ console.log(' $ bit-send mgWeRvUC6d1LRPKtdDbvYEpaUEmApS4XrY 0.2btc "dinner with friends"'); console.log(''); }); - program.parse(process.argv); var args = program.args; diff --git a/bit-wallet/bit-sign b/bit-wallet/bit-sign index 1450484..9a898f5 100755 --- a/bit-wallet/bit-sign +++ b/bit-wallet/bit-sign @@ -3,12 +3,9 @@ var _ = require('lodash'); var program = require('commander'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c,--config [file]', 'Wallet config filename') - .option('-v,--verbose', 'be verbose') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-status b/bit-wallet/bit-status index dcbdfa2..35cacc6 100755 --- a/bit-wallet/bit-status +++ b/bit-wallet/bit-status @@ -3,12 +3,9 @@ var _ = require('lodash'); var program = require('commander'); var utils = require('./cli-utils'); +program = utils.configureCommander(program); program - .version('0.0.1') - .option('-c, --config [file]', 'Wallet config filename') - .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') - .option('-v, --verbose', 'be verbose') .parse(process.argv); var args = program.args; diff --git a/bit-wallet/cli-utils.js b/bit-wallet/cli-utils.js index 237416d..5f5dcf9 100644 --- a/bit-wallet/cli-utils.js +++ b/bit-wallet/cli-utils.js @@ -36,7 +36,7 @@ Utils.confirmationId = function(copayer) { Utils.getClient = function(args) { var storage = new Client.FileStorage({ - filename: args.config || process.env['BIT_FILE'], + filename: args.file || process.env['BIT_FILE'], }); return new Client({ storage: storage, @@ -89,5 +89,14 @@ Utils.parseAmount = function(text) { return amountSat; }; +Utils.configureCommander = function(program) { + program + .version('0.0.1') + .option('-f, --file [filename]', 'Wallet file', 'bit.dat') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') + .option('-v, --verbose', 'be verbose') + + return program; +}; module.exports = Utils; diff --git a/lib/client/api.js b/lib/client/api.js index 8d73cfa..e2f32d5 100644 --- a/lib/client/api.js +++ b/lib/client/api.js @@ -227,7 +227,7 @@ API.prototype.createWallet = function(walletName, copayerName, m, n, network, cb this.storage.load(function(err, data) { if (data) - return cb('Storage already contains a wallet'); + return cb(self.storage.getName() + ' already contains a wallet'); var walletPrivKey = new Bitcore.PrivateKey(); var args = { diff --git a/lib/client/filestorage.js b/lib/client/filestorage.js index 35e6e69..17769da 100644 --- a/lib/client/filestorage.js +++ b/lib/client/filestorage.js @@ -3,12 +3,15 @@ var fs = require('fs') function FileStorage(opts) { if (!opts.filename) { - throw new Error('Please set the config filename'); + throw new Error('Please set wallet filename'); } this.filename = opts.filename; this.fs = opts.fs || fs; }; +FileStorage.prototype.getName = function() { + return this.filename; +}; FileStorage.prototype.save = function(data, cb) { this.fs.writeFile(this.filename, JSON.stringify(data), cb);