entropy

choam/src/main/java/com/salesforce/apollo/choam/Producer.java

@@ -128,7 +128,7 @@ public boolean complete() {
     }
 
     public void join(SignedViewMember viewMember) {
-        assembly.join(viewMember, true);
+        assembly.joined(viewMember);
     }
 
     public void start() {
@@ -234,7 +234,7 @@ private Parameters params() {
 
     private void processAssemblies(List<UnitData> aggregate) {
         var aggs = aggregate.stream().flatMap(e -> e.getAssembliesList().stream()).toList();
-        log.trace("Consuming {} assemblies from {} units on: {}", aggs.size(), aggregate.size(),
+        log.trace("Consuming: {} assemblies from: {} units on: {}", aggs.size(), aggregate.size(),
                   params().member().getId());
         assembly.assemble(aggs);
     }
@@ -313,14 +313,14 @@ private void publish(PendingBlock p) {
     }
 
     private void publish(PendingBlock p, boolean beacon) {
-        assert p.witnesses.size() >= params().majority() : "Publishing non majority block";
+        assert p.witnesses.size() >= params().majority() : "Attempt to publish non majority block";
         var publish = p.published.compareAndSet(false, true);
         if (!publish && !beacon) {
             log.trace("Already published: {} hash: {} height: {} witnesses: {} on: {}", p.block.block.getBodyCase(),
                       p.block.hash, p.block.height(), p.witnesses.values().size(), params().member().getId());
             return;
         }
-        log.trace("Publishing {}pending: {} hash: {} height: {} witnesses: {} on: {}", beacon ? "(beacon) " : "",
+        log.trace("Publishing {}: {} hash: {} height: {} witnesses: {} on: {}", beacon ? "(beacon) " : "(pending)",
                   p.block.block.getBodyCase(), p.block.hash, p.block.height(), p.witnesses.values().size(),
                   params().member().getId());
         final var cb = CertifiedBlock.newBuilder()
@@ -357,21 +357,22 @@ private void reconfigure() {
     }
 
     private void serial(List<ByteString> preblock, Boolean last) {
+        try {
+            serialize.acquire();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return;
+        }
         Thread.ofVirtual().start(() -> {
             try {
-                serialize.acquire();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                return;
-            }
-            try {
-                transitions.create(preblock, last);
+                create(preblock, last);
             } catch (Throwable t) {
                 log.error("Error processing preblock last: {} on: {}", last, params().member().getId(), t);
             } finally {
                 serialize.release();
             }
         });
+
     }
 
     private PendingBlock validate(Validate v) {
@@ -436,11 +437,6 @@ public void complete() {
             stop();
         }
 
-        @Override
-        public void create(List<ByteString> preblock, boolean last) {
-            Producer.this.create(preblock, last);
-        }
-
         @Override
         public void fail() {
             stop();