cleanups

Author: clabby

Cargo.lock

@@ -13,6 +13,7 @@ repository = "https://github.com/commonwarexyz/monorepo/tree/main/glue"
 workspace = true
 
 [dependencies]
+arbitrary = { workspace = true, optional = true, features = ["derive"] }
 bytes.workspace = true
 commonware-codec.workspace = true
 commonware-consensus.workspace = true
@@ -26,18 +27,32 @@ commonware-utils.workspace = true
 futures.workspace = true
 rand.workspace = true
 rand_core.workspace = true
+thiserror.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
 commonware-broadcast.workspace = true
 commonware-codec.workspace = true
+commonware-conformance.workspace = true
 commonware-consensus = { workspace = true, features = ["mocks"] }
 commonware-cryptography = { workspace = true, features = ["mocks"] }
 commonware-p2p.workspace = true
 commonware-parallel.workspace = true
 commonware-resolver.workspace = true
 commonware-storage.workspace = true
+prometheus-client.workspace = true
 tracing-subscriber.workspace = true
 
 [features]
 test-utils = []
+arbitrary = [
+	"commonware-codec/arbitrary",
+	"commonware-consensus/arbitrary",
+	"commonware-cryptography/arbitrary",
+	"commonware-p2p/arbitrary",
+	"commonware-resolver/arbitrary",
+	"commonware-runtime/arbitrary",
+	"commonware-storage/arbitrary",
+	"commonware-utils/arbitrary",
+	"dep:arbitrary",
+]

glue/Cargo.toml

@@ -0,0 +1,7 @@
+["commonware_glue::stateful::db::qmdb::resolver::handler::tests::conformance::CodecConformance<Request>"]
+n_cases = 65536
+hash = "44c363dc52376203a66269a71e13f7271c1a9beb1f8ee9dd9864a3ce7ae2c281"
+
+["commonware_glue::stateful::db::qmdb::resolver::handler::tests::conformance::CodecConformance<Response<u64,sha256::Digest>>"]
+n_cases = 65536
+hash = "84f9f3cad168682d218cc7e44e2ba71a54308833f6e7040ccd1b58a298c6b42a"

glue/conformance.toml

@@ -152,7 +152,7 @@ pub async fn bootstrap<E, A, S, V, R>(
 {
     let marshal_for_sync = marshal.clone();
     let mailbox_for_sync = mailbox.clone();
-    let (databases, sync_height, finalized_digest, floor_height) = {
+    let (databases, sync_height, last_processed_digest, floor_height) = {
         let mut metadata = Metadata::<E, U64, bool>::init(
             config.context.clone().with_label("state_sync_metadata"),
             MetadataConfig {
@@ -241,11 +241,21 @@ pub async fn bootstrap<E, A, S, V, R>(
             "sync complete, setting marshal floor and transitioning to running"
         );
         marshal.set_floor(floor_height).await;
+        let processed_height = marshal
+            .get_processed_height()
+            .await
+            .expect("marshal must respond with processed height after set_floor");
+        assert!(
+            processed_height >= floor_height,
+            "marshal floor must be applied before sync_complete"
+        );
     } else {
         info!(
             sync_height = sync_height.get(),
             "sync complete, transitioning to running"
         );
     }
-    mailbox.sync_complete(databases, finalized_digest).await;
+    mailbox
+        .sync_complete(databases, last_processed_digest)
+        .await;
 }