From f8ea81d70dc152b66305d200d05b32333ab7fdfa Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Thu, 16 Mar 2017 18:44:04 +0100 Subject: [PATCH] [enh] #854 Add "wasMember" field on /wot/requirements --- app/service/BlockchainService.js | 3 +++ package.json | 2 +- test/integration/identity-test.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/service/BlockchainService.js b/app/service/BlockchainService.js index b9bcc6c3e..5f1976729 100644 --- a/app/service/BlockchainService.js +++ b/app/service/BlockchainService.js @@ -265,6 +265,7 @@ function BlockchainService (server) { let expired = false; let outdistanced = false; let isSentry = false; + let wasMember = false; let expiresMS = 0; let expiresPending = 0; let certs = []; @@ -310,6 +311,7 @@ function BlockchainService (server) { expiresPending = conf.msValidity; } } + wasMember = idty.wasMember; isSentry = idty.member && (yield dal.isSentry(idty.pub, conf)); // Expiration of certifications for (const cert of certs) { @@ -335,6 +337,7 @@ function BlockchainService (server) { expired: expired, outdistanced: outdistanced, isSentry: isSentry, + wasMember: wasMember, certifications: certs, membershipPendingExpiresIn: expiresPending, membershipExpiresIn: expiresMS diff --git a/package.json b/package.json index eb8d0f1ca..85e6479c9 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "colors": "1.1.2", "commander": "2.9.0", "daemonize2": "0.4.2", - "duniter-bma": "^1.0.0", + "duniter-bma": "^1.0.1", "duniter-common": "^1.0.0", "duniter-crawler": "^1.0.0", "duniter-keypair": "^1.0.0", diff --git a/test/integration/identity-test.js b/test/integration/identity-test.js index 6d63d78e0..63f2b4a0e 100644 --- a/test/integration/identity-test.js +++ b/test/integration/identity-test.js @@ -217,6 +217,7 @@ describe("Identities collision", function() { res.identities[0].should.have.property('pubkey').equal('HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd'); res.identities[0].should.have.property('uid').equal('cat'); res.identities[0].should.have.property('meta').property('timestamp'); + res.identities[0].should.have.property('wasMember').equal(true); res.identities[0].should.have.property('expired').equal(false); // Because it has been a member once! So its identity will exist forever. res.identities[0].should.have.property('outdistanced').equal(false); res.identities[0].should.have.property('isSentry').equal(true); // dSen = 2, cat has issued and received 2 certs with tic and toc -- GitLab