rename

salesforce · May 30, 2024 · 0b6f6d2 · 0b6f6d2
1 parent 2d80e40
commit 0b6f6d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/fireflies/src/main/java/com/salesforce/apollo/fireflies/Binding.java b/fireflies/src/main/java/com/salesforce/apollo/fireflies/Binding.java
@@ -229,8 +229,8 @@ private Join join(Digest v) {
                 this.context.rebalance(r.getCardinality());
                 node.nextNote(view);
 
-                log.debug("Completing redirect to view: {} context: {} sample: {} on: {}", view, this.context.getId(),
-                          r.getSampleCount(), node.getId());
+                log.debug("Completing redirect to view: {} context: {} introductions: {} on: {}", view,
+                          this.context.getId(), r.getIntroductionsCount(), node.getId());
                 if (timer != null) {
                     timer.close();
                 }
@@ -240,7 +240,7 @@ private Join join(Digest v) {
     }
 
     private void join(Redirect redirect, Digest v, Duration duration) {
-        var sample = redirect.getSampleList()
+        var sample = redirect.getIntroductionsList()
                              .stream()
                              .map(sn -> new NoteWrapper(sn, digestAlgo))
                              .map(nw -> view.new Participant(nw))

diff --git a/fireflies/src/main/java/com/salesforce/apollo/fireflies/ViewManagement.java b/fireflies/src/main/java/com/salesforce/apollo/fireflies/ViewManagement.java
@@ -467,14 +467,14 @@ Redirect seed(Registration registration, Digest from) {
 
             final var introductions = observers.stream().map(context::getMember).toList();
 
-            log.debug("Member seeding: {} view: {} context: {} sample: {} on: {}", newMember.getId(), currentView(),
-                      context.getId(), introductions.size(), node.getId());
+            log.debug("Member seeding: {} view: {} context: {} introductions: {} on: {}", newMember.getId(),
+                      currentView(), context.getId(), introductions.size(), node.getId());
             return Redirect.newBuilder()
                            .setView(currentView().toDigeste())
-                           .addAllSample(introductions.stream()
-                                                      .filter(java.util.Objects::nonNull)
-                                                      .map(Participant::getSignedNote)
-                                                      .toList())
+                           .addAllIntroductions(introductions.stream()
+                                                             .filter(java.util.Objects::nonNull)
+                                                             .map(Participant::getSignedNote)
+                                                             .toList())
                            .setCardinality(cardinality())
                            .setBootstrap(bootstrap)
                            .setRings(context.getRingCount())

diff --git a/grpc/src/main/proto/fireflies.proto b/grpc/src/main/proto/fireflies.proto
@@ -132,7 +132,7 @@ message Redirect {
   int32 cardinality = 2;
   int32 rings = 3;
   bool bootstrap = 4;
-  repeated SignedNote sample = 6;
+  repeated SignedNote introductions = 6;
 }
 
 message Join {