[PAN-2529] subscribing to sync events should receive false when in sy…

…nc (PegaSysEng#1240)
notlesh · May 4, 2019 · 8690418 · 8690418
1 parent 8a84992
commit 8690418
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java
@@ -38,6 +38,10 @@ public long getHighestBlock() {
     return highestBlock;
   }
 
+  public boolean inSync() {
+    return currentBlock == highestBlock;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) {

diff --git a/.../pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java b/.../pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java
@@ -35,7 +35,12 @@ private void sendSyncingToMatchingSubscriptions(final SyncStatus syncStatus) {
     final List<Subscription> syncingSubscriptions =
         subscriptionManager.subscriptionsOfType(SubscriptionType.SYNCING, Subscription.class);
 
-    syncingSubscriptions.forEach(
-        s -> subscriptionManager.sendMessage(s.getId(), new SyncingResult(syncStatus)));
+    if (syncStatus.inSync()) {
+      syncingSubscriptions.forEach(
+          s -> subscriptionManager.sendMessage(s.getId(), new NotSynchronisingResult()));
+    } else {
+      syncingSubscriptions.forEach(
+          s -> subscriptionManager.sendMessage(s.getId(), new SyncingResult(syncStatus)));
+    }
   }
 }
diff --git a/...theon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java b/...theon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java
@@ -53,11 +53,24 @@ public void shouldSendSyncStatusWhenReceiveSyncStatus() {
     final SyncingSubscription subscription = new SyncingSubscription(9L, SubscriptionType.SYNCING);
     when(subscriptionManager.subscriptionsOfType(any(), any()))
         .thenReturn(Lists.newArrayList(subscription));
-    final SyncStatus syncStatus = new SyncStatus(0L, 1L, 1L);
+    final SyncStatus syncStatus = new SyncStatus(0L, 1L, 3L);
     final SyncingResult expectedSyncingResult = new SyncingResult(syncStatus);
 
     syncStatusListener.onSyncStatus(syncStatus);
 
     verify(subscriptionManager).sendMessage(eq(subscription.getId()), eq(expectedSyncingResult));
   }
+
+  @Test
+  public void shouldSendNotSyncingStatusWhenReceiveSyncStatusAtHead() {
+    final SyncingSubscription subscription = new SyncingSubscription(9L, SubscriptionType.SYNCING);
+    when(subscriptionManager.subscriptionsOfType(any(), any()))
+        .thenReturn(Lists.newArrayList(subscription));
+    final SyncStatus syncStatus = new SyncStatus(0L, 1L, 1L);
+
+    syncStatusListener.onSyncStatus(syncStatus);
+
+    verify(subscriptionManager)
+        .sendMessage(eq(subscription.getId()), any(NotSynchronisingResult.class));
+  }
 }