From 983d1bcfb80f04e1756cd7d01edacb9a7c4dc1fc Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Thu, 2 Mar 2017 10:54:29 +0100
Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0#858=20Have=20a=20symmetric=20DB=20b?=
=?UTF-8?q?etween=20with=20or=20without=20`--cautious`=20option=20during?=
=?UTF-8?q?=20sync?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/lib/dup/indexer.js | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/app/lib/dup/indexer.js b/app/lib/dup/indexer.js
index ab06ebdf8..e0e969553 100644
--- a/app/lib/dup/indexer.js
+++ b/app/lib/dup/indexer.js
@@ -1366,22 +1366,13 @@ const indexer = module.exports = {
const MS = yield dal.mindexDAL.getReducedMS(POTENTIAL.pub);
const hasRenewedSince = MS.expires_on > HEAD.medianTime;
if (!MS.expired_on && !hasRenewedSince) {
- let shouldBeKicked = true;
- // ------ Fast synchronization specific code ------
- const idty = yield dal.iindexDAL.getFromPubkey(POTENTIAL.pub);
- if (!idty.member) {
- shouldBeKicked = false;
- }
- // ------------------------------------------------
- if (shouldBeKicked) {
- expiries.push({
- op: 'UPDATE',
- pub: MS.pub,
- created_on: MS.created_on,
- written_on: [HEAD.number, HEAD.hash].join('-'),
- expired_on: HEAD.medianTime
- });
- }
+ expiries.push({
+ op: 'UPDATE',
+ pub: MS.pub,
+ created_on: MS.created_on,
+ written_on: [HEAD.number, HEAD.hash].join('-'),
+ expired_on: HEAD.medianTime
+ });
}
}
return expiries;
--
GitLab