minor cleanup

salesforce · Feb 10, 2024 · f9812d7 · f9812d7
1 parent 8c00314
commit f9812d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/fsm/Reconfiguration.java b/choam/src/main/java/com/salesforce/apollo/choam/fsm/Reconfiguration.java
@@ -42,11 +42,6 @@ public void certify() {
                 context().certify();
             }
 
-            @Override
-            public Transitions election() {
-                return RECONFIGURE;
-            }
-
             @Override
             public Transitions gathered() {
                 return CERTIFICATION;
@@ -62,11 +57,6 @@ public void assembly() {
                 context().gather();
             }
 
-            @Override
-            public Transitions election() {
-                return RECONFIGURE;
-            }
-
             @Override
             public Transitions gathered() {
                 return NOMINATION;
@@ -97,11 +87,6 @@ public Transitions complete() {
                 return null;
             }
 
-            @Override
-            public Transitions election() {
-                return null;
-            }
-
             @Override
             public Transitions failed() {
                 return null;
@@ -162,10 +147,6 @@ default Transitions complete() {
             return Reconfigure.RECONFIGURE;
         }
 
-        default Transitions election() {
-            return null;
-        }
-
         default Transitions failed() {
             return Reconfigure.PROTOCOL_FAILURE;
         }

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/support/TxDataSource.java b/choam/src/main/java/com/salesforce/apollo/choam/support/TxDataSource.java
@@ -161,11 +161,11 @@ public void offer(Reassemble reassembly) {
     }
 
     public boolean offer(Transaction txn) {
-        if (!draining.get()) {
-            return processing.offer(txn);
-        } else {
+        if (draining.get()) {
             return false;
         }
+
+        return processing.offer(txn);
     }
 
     public void offer(Validate generateValidation) {