correct signing key. active at genesis, not (missing) assemble

salesforce · Apr 15, 2024 · 6e1e5be · 6e1e5be
1 parent 39fabd1
commit 6e1e5be
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java
@@ -262,7 +262,7 @@ public boolean active() {
         final var c = current.get();
         HashedCertifiedBlock h = head.get();
         return (c != null && h != null && transitions.fsm().getCurrentState() == Mercantile.OPERATIONAL)
-        && c instanceof Administration && h.height().compareTo(ULong.valueOf(1)) >= 0;
+        && c instanceof Administration && h.height().compareTo(ULong.valueOf(0)) >= 0;
     }
 
     public DelegatedContext<Member> context() {

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/Producer.java b/choam/src/main/java/com/salesforce/apollo/choam/Producer.java
@@ -343,6 +343,7 @@ public void checkAssembly() {
             log.debug("Final view assembly election on: {}", params().member().getId());
             if (assembled.get()) {
                 assembled();
+                controller.completeIt();
             }
         }
 

diff --git a/model/src/test/java/com/salesforce/apollo/model/ContainmentDomainTest.java b/model/src/test/java/com/salesforce/apollo/model/ContainmentDomainTest.java
@@ -131,7 +131,7 @@ private Builder params() {
                                                               .setMaxBatchCount(3000)
                                                               .build())
                                .setCheckpointBlockDelta(200);
-        params.getProducer().ethereal().setNumberOfEpochs(4);
+        params.getProducer().ethereal().setEpochLength(4).setNumberOfEpochs(4);
         return params;
     }
 }
diff --git a/model/src/test/resources/logback-test.xml b/model/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
         <appender-ref ref="STDOUT"/>
     </logger>
 
-    <logger name="com.salesforce.apollo.choam.CHOAM" level="warn" additivity="false">
+    <logger name="com.salesforce.apollo.choam.CHOAM" level="info" additivity="false">
         <appender-ref ref="STDOUT"/>
     </logger>