RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests.

Browse Source
This commit is contained in:
Chris Kleeschulte 2017-09-28 21:59:45 -04:00
parent ed1ed7b8b9
commit d93fc791e3
No known key found for this signature in database
GPG Key ID: 33195D27EF6BDB7F
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/addresses.js
View File

@ -89,17 +89,22 @@ AddressController.prototype.getAddressSummary = function(address, options, callb
}); });
}; };
AddressController.prototype.checkAddr = function(req, res, next) {
req.addr = req.params.addr;
this.check(req, res, next, [req.addr]);
};
AddressController.prototype.checkAddrs = function(req, res, next) { AddressController.prototype.checkAddrs = function(req, res, next) {
if(req.body.addrs) { function makeArray(addrs) {
req.addrs = req.body.addrs.split(','); if (_.isString(addrs)) {
return addrs.split(',');
}
return addrs;
}
if (req.params.addr) {
req.addr = req.params.addr;
req.addrs = [req.addr];
} else if(req.body.addrs) {
req.addrs = makeArray(req.body.addrs);
} else { } else {
req.addrs = req.params.addrs.split(','); req.addrs = makeArray(req.params.addrs);
} }
if(!_.isArray(req.addrs) || _.compact(req.addrs).length < 1) { if(!_.isArray(req.addrs) || _.compact(req.addrs).length < 1) {

12
lib/index.js
View File

@ -213,18 +213,18 @@ InsightAPI.prototype.setupRoutes = function(app) {
// Address routes // Address routes
var addresses = new AddressController(this.node); var addresses = new AddressController(this.node);
app.get('/addr/:addr', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.show.bind(addresses)); app.get('/addr/:addr', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.show.bind(addresses));
app.get('/addr/:addr/utxo', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.utxo.bind(addresses)); app.get('/addr/:addr/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.utxo.bind(addresses));
app.get('/addrs/:addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses)); app.get('/addrs/:addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses));
app.post('/addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses)); app.post('/addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses));
app.get('/addrs/:addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses)); app.get('/addrs/:addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses));
app.post('/addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses)); app.post('/addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses));
// Address property routes // Address property routes
app.get('/addr/:addr/balance', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.balance.bind(addresses)); app.get('/addr/:addr/balance', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.balance.bind(addresses));
app.get('/addr/:addr/totalReceived', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.totalReceived.bind(addresses)); app.get('/addr/:addr/totalReceived', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.totalReceived.bind(addresses));
app.get('/addr/:addr/totalSent', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.totalSent.bind(addresses)); app.get('/addr/:addr/totalSent', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.totalSent.bind(addresses));
app.get('/addr/:addr/unconfirmedBalance', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.unconfirmedBalance.bind(addresses)); app.get('/addr/:addr/unconfirmedBalance', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.unconfirmedBalance.bind(addresses));
// Status route // Status route
var status = new StatusController(this.node); var status = new StatusController(this.node);

4
regtest/address.js
View File

@ -414,8 +414,6 @@ describe('Address', function() {
}); });
}); });
it('should get address info correctly: /addr/:addr', function(done) { it('should get address info correctly: /addr/:addr', function(done) {
var httpOpts = { var httpOpts = {
@ -434,7 +432,7 @@ describe('Address', function() {
return done(err); return done(err);
} }
//console.log(data); console.log(data);
expect(data.balance).to.equal(0); expect(data.balance).to.equal(0);
expect(data.totalSent).to.equal(25); expect(data.totalSent).to.equal(25);
done(); done();

8
test/addresses.js
View File

@ -162,20 +162,20 @@ var utxos = [
{ {
'address': 'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK', 'address': 'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK',
'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73', 'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73',
'outputIndex': 1, 'vout': 1,
'timestamp': 1441116143, 'timestamp': 1441116143,
'satoshis': 53320000, 'satoshis': 53320000,
'script': '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac', 'scriptPubKey': '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac',
'height': 534181, 'height': 534181,
'confirmations': 50 'confirmations': 50
}, },
{ {
'address': 'moZY18rGNmh4YCPeugtGW46AkkWMQttBUD', 'address': 'moZY18rGNmh4YCPeugtGW46AkkWMQttBUD',
'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73', 'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73',
'outputIndex': 2, 'vout': 2,
'timestamp': 1441116143, 'timestamp': 1441116143,
'satoshis': 289829, 'satoshis': 289829,
'script': '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac', 'scriptPubKey': '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac',
'height': 534181, 'height': 534181,
'confirmations': 50 'confirmations': 50
} }