From 87b6ec60f2e7963cdc0bc2af98a65126bf56acce Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 10 Apr 2015 20:44:13 -0300 Subject: [PATCH 1/3] relocate locker server --- locker-server.js | 6 ------ locker/locker.js | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 locker-server.js create mode 100644 locker/locker.js diff --git a/locker-server.js b/locker-server.js deleted file mode 100644 index 4610684..0000000 --- a/locker-server.js +++ /dev/null @@ -1,6 +0,0 @@ -(function() { - var Locker = require('locker-server'), - locker = new Locker(); - - locker.listen(3003); -})(); diff --git a/locker/locker.js b/locker/locker.js new file mode 100644 index 0000000..c703aa2 --- /dev/null +++ b/locker/locker.js @@ -0,0 +1,9 @@ +#!/usr/bin/env node + +var PORT = 3003; + +console.log('Server started at port ' + PORT + '...'); +var Locker = require('locker-server'), + locker = new Locker(); + +locker.listen(PORT); From 04d65978640211e8847be6eb2111c71b8d402fb6 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 13 Apr 2015 10:02:26 -0300 Subject: [PATCH 2/3] add json response on delete --- lib/expressapp.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/expressapp.js b/lib/expressapp.js index 9f12330..ac8fe9f 100644 --- a/lib/expressapp.js +++ b/lib/expressapp.js @@ -267,6 +267,9 @@ ExpressApp.start = function(opts) { req.body.txProposalId = req.params['id']; server.removePendingTx(req.body, function(err) { if (err) return returnError(err, res, req); + res.json({ + success: true + }); res.end(); }); }); From 114deeeabef8b1b5eb4f2e1d6a5d1a111c2610e8 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 13 Apr 2015 10:27:57 -0300 Subject: [PATCH 3/3] v0.0.25 --- package.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 149e663..e5add84 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "bitcore-wallet-service", "description": "A service for Mutisig HD Bitcoin Wallets", "author": "BitPay Inc", - "version": "0.0.24", + "version": "0.0.25", "keywords": [ "bitcoin", "copay", @@ -58,14 +58,11 @@ "test": "./node_modules/.bin/mocha", "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" }, - "contributors": [ - { - "name": "Ivan Socolsky", - "email": "ivan@bitpay.com" - }, - { - "name": "Matias Alejo Garcia", - "email": "ematiu@gmail.com" - } - ] + "contributors": [{ + "name": "Ivan Socolsky", + "email": "ivan@bitpay.com" + }, { + "name": "Matias Alejo Garcia", + "email": "ematiu@gmail.com" + }] }