Merge pull request #605 from EspressoSystems/tw/small-fixes

Various small fixes.

Author: twittner

timeboost-sequencer/src/decrypt.rs

@@ -402,7 +402,7 @@ impl Decrypter {
         k: KeyStore,
     ) -> StdResult<(), DecrypterDown> {
         debug!(node = %self.label, committee = %c.committee().id(), "next committee");
-        c.update_addresses(|a| a.to_owned().with_offset(DECRYPTER_PORT_OFFSET * 100));
+        c.update_addresses(|a| a.to_owned().with_offset(DECRYPTER_PORT_OFFSET));
         self.worker_tx
             .send(Command::NextCommittee(c, k))
             .await

timeboost-sequencer/src/lib.rs

@@ -381,26 +381,25 @@ impl Task {
 
         // Process actions and collect deliveries.
         while let Some(action) = actions.pop_front() {
-            if let Action::Deliver(payload) = action {
-                match payload.data().decode::<MAX_MESSAGE_SIZE>() {
-                    Ok(data) => {
-                        if let Some(dkg) = data.dkg_bundle() {
-                            dkg_bundles.push_back(dkg.clone());
+            match self.sailfish.execute(action).await {
+                Ok(Some(CoordinatorEvent::Deliver(payload))) => {
+                    match payload.data().decode::<MAX_MESSAGE_SIZE>() {
+                        Ok(data) => {
+                            if let Some(dkg) = data.dkg_bundle() {
+                                dkg_bundles.push_back(dkg.clone());
+                            }
+                            payloads.push((payload, data));
+                        }
+                        Err(err) => {
+                            warn!(
+                                node = %self.label,
+                                err  = %err,
+                                src  = %payload.source(),
+                                "failed to deserialize candidate list"
+                            );
                         }
-                        payloads.push((payload, data));
-                    }
-                    Err(err) => {
-                        warn!(
-                            node = %self.label,
-                            err  = %err,
-                            src  = %payload.source(),
-                            "failed to deserialize candidate list"
-                        );
                     }
                 }
-                continue;
-            }
-            match self.sailfish.execute(action).await {
                 Ok(Some(CoordinatorEvent::Gc(r))) => {
                     if let Err(err) = self.decrypter.gc(r.num()).await {
                         warn!(node = %self.label, %err, "decrypt gc error");
@@ -426,7 +425,7 @@ impl Task {
                         warn!(node = %self.label, id = %r.committee(), "committee not found");
                     }
                 }
-                Ok(Some(CoordinatorEvent::Deliver(_)) | None) => {}
+                Ok(None) => {}
                 Err(err) => {
                     error!(node = %self.label, %err, "coordinator error");
                     return Err(err.into());

timeboost/src/lib.rs

@@ -191,6 +191,9 @@ impl Timeboost {
                                 comm_info.sailfish_committee(),
                                 comm_info.dkg_key_store()
                             ).await?;
+                            self.certifier
+                                .set_next_committee(comm_info.certifier_committee())
+                                .await?;
                         } else {
                             warn!(node = %self.label, committee_id = %new_id, current = %cur, "ignored new CommitteeCreated event");
                             continue;