From b9afbaf0de7f956412586862fa69c1382b0ea07f Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Sun, 8 Feb 2015 18:45:13 -0300 Subject: [PATCH] remove isChange arg from #createAddress --- lib/server.js | 6 +--- test/integration.js | 75 +++++++++++---------------------------------- 2 files changed, 19 insertions(+), 62 deletions(-) diff --git a/lib/server.js b/lib/server.js index 8924178..5b1880e 100644 --- a/lib/server.js +++ b/lib/server.js @@ -191,21 +191,17 @@ CopayServer.prototype.joinWallet = function(opts, cb) { /** * Creates a new address. * @param {Object} opts - * @param {truthy} opts.isChange - Indicates whether this is a regular address or a change address. * @returns {Address} address */ CopayServer.prototype.createAddress = function(opts, cb) { var self = this; - var isChange = opts.isChange || false; - - Utils.checkRequired(opts, ['isChange']); Utils.runLocked(self.walletId, cb, function(cb) { self.getWallet({}, function(err, wallet) { if (err) return cb(err); if (!wallet.isComplete()) return cb(new ClientError('Wallet is not complete')); - var address = wallet.createAddress(opts.isChange); + var address = wallet.createAddress(false); self.storage.storeAddress(wallet.id, address, function(err) { if (err) return cb(err); diff --git a/test/integration.js b/test/integration.js index a12751e..06bc599 100644 --- a/test/integration.js +++ b/test/integration.js @@ -130,9 +130,7 @@ helpers.createUtxos = function(server, wallet, amounts, cb) { var addresses = []; async.each(amounts, function(a, next) { - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { addresses.push(address); next(err); }); @@ -510,10 +508,8 @@ describe('Copay server', function() { }); }); - it('should create main address', function(done) { - server.createAddress({ - isChange: false, - }, function(err, address) { + it('should create address', function(done) { + server.createAddress({}, function(err, address) { should.not.exist(err); address.should.exist; address.address.should.equal('36JdLEUDa6UwCfMhhkdZ2VFnDrGUoLedsR'); @@ -522,19 +518,6 @@ describe('Copay server', function() { }); }); - - it('should create change address', function(done) { - server.createAddress({ - isChange: true, - }, function(err, address) { - should.not.exist(err); - address.should.exist; - address.address.should.equal('3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH'); - address.path.should.equal('m/2147483647/1/0'); - done(); - }); - }); - it('should fail to create address when wallet is not complete', function(done) { var server = new CopayServer(); var walletOpts = { @@ -554,9 +537,7 @@ describe('Copay server', function() { server.joinWallet(copayerOpts, function(err, copayerId) { should.not.exist(err); helpers.getAuthServer(copayerId, function(server) { - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { should.not.exist(address); err.should.exist; err.message.should.contain('not complete'); @@ -570,9 +551,7 @@ describe('Copay server', function() { it('should create many addresses on simultaneous requests', function(done) { var N = 5; async.map(_.range(N), function(i, cb) { - server.createAddress({ - isChange: false, - }, cb); + server.createAddress({}, cb); }, function(err, addresses) { addresses.length.should.equal(N); _.each(_.range(N), function(i) { @@ -588,9 +567,7 @@ describe('Copay server', function() { var storeWalletStub = sinon.stub(server.storage, 'storeWallet'); storeWalletStub.yields('dummy error'); - server.createAddress({ - isChange: true, - }, function(err, address) { + server.createAddress({}, function(err, address) { err.should.exist; should.not.exist(address); @@ -598,13 +575,11 @@ describe('Copay server', function() { addresses.length.should.equal(0); server.storage.storeWallet.restore(); - server.createAddress({ - isChange: true, - }, function(err, address) { + server.createAddress({}, function(err, address) { should.not.exist(err); address.should.exist; - address.address.should.equal('3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH'); - address.path.should.equal('m/2147483647/1/0'); + address.address.should.equal('36JdLEUDa6UwCfMhhkdZ2VFnDrGUoLedsR'); + address.path.should.equal('m/2147483647/0/0'); done(); }); }); @@ -615,9 +590,7 @@ describe('Copay server', function() { var storeAddressStub = sinon.stub(server.storage, 'storeAddress'); storeAddressStub.yields('dummy error'); - server.createAddress({ - isChange: true, - }, function(err, address) { + server.createAddress({}, function(err, address) { err.should.exist; should.not.exist(address); @@ -625,13 +598,11 @@ describe('Copay server', function() { addresses.length.should.equal(0); server.storage.storeAddress.restore(); - server.createAddress({ - isChange: true, - }, function(err, address) { + server.createAddress({}, function(err, address) { should.not.exist(err); address.should.exist; - address.address.should.equal('3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH'); - address.path.should.equal('m/2147483647/1/0'); + address.address.should.equal('36JdLEUDa6UwCfMhhkdZ2VFnDrGUoLedsR'); + address.path.should.equal('m/2147483647/0/0'); done(); }); }); @@ -645,9 +616,7 @@ describe('Copay server', function() { helpers.createAndJoinWallet(2, 2, function(s, w) { server = s; wallet = w; - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { done(); }); }); @@ -871,9 +840,7 @@ describe('Copay server', function() { helpers.createAndJoinWallet(2, 2, function(s, w) { server = s; wallet = w; - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { helpers.createUtxos(server, wallet, helpers.toSatoshi([1, 2, 3, 4, 5, 6, 7, 8]), function(utxos) { helpers.stubBlockExplorer(server, utxos); var txOpts = { @@ -950,9 +917,7 @@ describe('Copay server', function() { helpers.createAndJoinWallet(1, 1, function(s, w) { server = s; wallet = w; - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { helpers.createUtxos(server, wallet, helpers.toSatoshi([1, 2, 3, 4, 5, 6, 7, 8]), function(inutxos) { utxos = inutxos; done(); @@ -1035,9 +1000,7 @@ describe('Copay server', function() { helpers.createAndJoinWallet(2, 3, function(s, w) { server = s; wallet = w; - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { helpers.createUtxos(server, wallet, helpers.toSatoshi([1, 2, 3, 4, 5, 6, 7, 8]), function(inutxos) { utxos = inutxos; done(); @@ -1091,9 +1054,7 @@ describe('Copay server', function() { helpers.createAndJoinWallet(1, 1, function(s, w) { server = s; wallet = w; - server.createAddress({ - isChange: false, - }, function(err, address) { + server.createAddress({}, function(err, address) { helpers.createUtxos(server, wallet, helpers.toSatoshi(_.range(10)), function(utxos) { helpers.stubBlockExplorer(server, utxos); var txOpts = {