use bftSlice for gorgoneion/maat successors

salesforce · Jun 2, 2024 · 91e0d86 · 91e0d86
1 parent c19e043
commit 91e0d86
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 36 deletions.
diff --git a/gorgoneion/src/main/java/com/salesforce/apollo/gorgoneion/Gorgoneion.java b/gorgoneion/src/main/java/com/salesforce/apollo/gorgoneion/Gorgoneion.java
@@ -157,10 +157,8 @@ private SignedNonce generateNonce(KERL_ application) {
                          .setTimestamp(Timestamp.newBuilder().setSeconds(now.getEpochSecond()).setNanos(now.getNano()))
                          .build();
 
-        var successors = context.size() == 1 ? Collections.singletonList(member) : Context.uniqueSuccessors(context,
-                                                                                                            digestOf(
-                                                                                                            ident,
-                                                                                                            parameters.digestAlgorithm()));
+        var successors = context.size() == 1 ? Collections.singletonList(member)
+                                             : context.bftSubset(digestOf(ident, parameters.digestAlgorithm()));
         final var majority = context.size() == 1 ? 1 : context.majority();
         final var redirecting = new SliceIterator<>("Nonce Endorsement", member, successors, endorsementComm);
         Set<MemberSignature> endorsements = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -222,8 +220,7 @@ private void notarize(Credentials credentials, Validations validations) {
                                        .setValidations(validations)
                                        .build();
 
-        var successors = Context.uniqueSuccessors(context,
-                                                  digestOf(identifier.toIdent(), parameters.digestAlgorithm()));
+        var successors = context.bftSubset(digestOf(identifier.toIdent(), parameters.digestAlgorithm()));
         final var majority = context.size() == 1 ? 1 : context.majority();
         SliceIterator<Endorsement> redirecting = new SliceIterator<>("Enrollment", member, successors, endorsementComm);
         var completed = new HashSet<Member>();
@@ -249,8 +246,7 @@ private Validations register(Credentials request) {
 
         var validated = new CompletableFuture<Validations>();
 
-        var successors = Context.uniqueSuccessors(context,
-                                                  digestOf(identifier.toIdent(), parameters.digestAlgorithm()));
+        var successors = context.bftSubset(digestOf(identifier.toIdent(), parameters.digestAlgorithm()));
         final var majority = context.size() == 1 ? 1 : context.majority();
         final var redirecting = new SliceIterator<>("Credential verification", member, successors, endorsementComm);
         var verifications = new HashSet<Validation_>();

diff --git a/memberships/src/main/java/com/salesforce/apollo/context/Context.java b/memberships/src/main/java/com/salesforce/apollo/context/Context.java
@@ -12,7 +12,6 @@
 import com.salesforce.apollo.membership.Util;
 import org.apache.commons.math3.random.BitsStreamGenerator;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -34,18 +33,6 @@ public interface Context<T extends Member> {
 
     double DEFAULT_EPSILON = 0.99999;
 
-    static List<Member> uniqueSuccessors(Context<Member> context, Digest digest) {
-        Set<Member> post = new HashSet<>();
-        context.successors(digest, m -> {
-            if (post.size() == context.getRingCount()) {
-                return false;
-            }
-            return post.add(m);
-        });
-        var successors = new ArrayList<>(post);
-        return successors;
-    }
-
     static Digest hashFor(Digest ctxId, int ring, Digest d) {
         return d.prefix(ctxId, ring);
     }
@@ -516,11 +503,22 @@ default int toleranceLevel() {
     Iterable<T> traverse(int ring, T member);
 
     /**
-     * collect the list of successors to the key on each ring that pass the provided predicate test and provide a unique
-     * member per ring if possible.
+     * collect the list of successors to the key on each ring that pass the provided predicate test, and providing a
+     * unique member per ring if possible.
      */
     void uniqueSuccessors(Digest key, Predicate<T> test, Set<T> collector);
 
+    default Set<T> uniqueSuccessors(Digest digest) {
+        var collected = new HashSet<T>();
+        uniqueSuccessors(digest, collected);
+        return collected;
+    }
+
+    /**
+     * collect the list of successors to the key on each ring, providing a unique member per ring if possible.
+     */
+    void uniqueSuccessors(Digest key, Set<T> collector);
+
     boolean validRing(int ring);
 
     /**

diff --git a/memberships/src/main/java/com/salesforce/apollo/context/DelegatedContext.java b/memberships/src/main/java/com/salesforce/apollo/context/DelegatedContext.java
@@ -348,6 +348,11 @@ public void uniqueSuccessors(Digest key, Predicate<T> test, Set<T> collector) {
         delegate.uniqueSuccessors(key, test, collector);
     }
 
+    @Override
+    public void uniqueSuccessors(Digest key, Set<T> collector) {
+        delegate.uniqueSuccessors(key, collector);
+    }
+
     @Override
     public boolean validRing(int ring) {
         return delegate.validRing(ring);

diff --git a/memberships/src/main/java/com/salesforce/apollo/context/DynamicContextImpl.java b/memberships/src/main/java/com/salesforce/apollo/context/DynamicContextImpl.java
@@ -732,7 +732,6 @@ public Iterable<T> traverse(int ring, T member) {
      */
     @Override
     public void uniqueSuccessors(Digest key, Predicate<T> test, Set<T> collector) {
-        Set<T> successors = new HashSet<>();
         for (Ring<T> ring : rings) {
             T successor = ring.successor(key, m -> !collector.contains(m) && test.test(m));
             if (successor != null) {
@@ -741,6 +740,11 @@ public void uniqueSuccessors(Digest key, Predicate<T> test, Set<T> collector) {
         }
     }
 
+    @Override
+    public void uniqueSuccessors(Digest key, Set<T> collector) {
+        uniqueSuccessors(key, t -> true, collector);
+    }
+
     @Override
     public boolean validRing(int ring) {
         return ring >= 0 && ring < rings.size();

diff --git a/memberships/src/main/java/com/salesforce/apollo/context/StaticContext.java b/memberships/src/main/java/com/salesforce/apollo/context/StaticContext.java
@@ -458,6 +458,11 @@ public void uniqueSuccessors(Digest key, Predicate<T> test, Set<T> collector) {
         }
     }
 
+    @Override
+    public void uniqueSuccessors(Digest key, Set<T> collector) {
+        uniqueSuccessors(key, t -> true, collector);
+    }
+
     @Override
     public boolean validRing(int ring) {
         return ring >= 0 && ring < rings.length;

diff --git a/memberships/src/main/java/com/salesforce/apollo/ring/SliceIterator.java b/memberships/src/main/java/com/salesforce/apollo/ring/SliceIterator.java
@@ -18,9 +18,7 @@
 
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -41,20 +39,20 @@ public class SliceIterator<Comm extends Link> {
     private       Member                        current;
     private       Iterator<? extends Member>    currentIteration;
 
-    public SliceIterator(String label, SigningMember member, List<? extends Member> slice,
+    public SliceIterator(String label, SigningMember member, Collection<? extends Member> slice,
                          CommonCommunications<Comm, ?> comm) {
         this(label, member, slice, comm, Executors.newScheduledThreadPool(1, Thread.ofVirtual().factory()));
     }
 
-    public SliceIterator(String label, SigningMember member, List<? extends Member> slice,
+    public SliceIterator(String label, SigningMember member, Collection<? extends Member> s,
                          CommonCommunications<Comm, ?> comm, ScheduledExecutorService scheduler) {
-        assert member != null && slice != null && comm != null;
+        assert member != null && s != null && comm != null;
         this.label = label;
         this.member = member;
-        this.slice = slice;
+        this.slice = new ArrayList<>(s);
         this.comm = comm;
         this.scheduler = scheduler;
-        Entropy.secureShuffle(slice);
+        Entropy.secureShuffle(this.slice);
         this.currentIteration = slice.iterator();
         log.debug("Slice for: <{}> is: {} on: {}", label, slice.stream().map(m -> m.getId()).toList(), member.getId());
     }

diff --git a/thoth/src/main/java/com/salesforce/apollo/thoth/Maat.java b/thoth/src/main/java/com/salesforce/apollo/thoth/Maat.java
@@ -82,10 +82,10 @@ public boolean validate(EstablishmentEvent event) {
             return false;
         }
         final Context<Member> ctx = context;
-        var successors = Context.uniqueSuccessors(ctx, digestOf(event.getIdentifier().toIdent(), digest.getAlgorithm()))
-                                .stream()
-                                .map(m -> m.getId())
-                                .collect(Collectors.toSet());
+        var successors = ctx.bftSubset(digestOf(event.getIdentifier().toIdent(), digest.getAlgorithm()))
+                            .stream()
+                            .map(m -> m.getId())
+                            .collect(Collectors.toSet());
 
         record validator(EstablishmentEvent validating, JohnHancock signature) {
         }