Merge pull request #397 from btpworks/fix/sleep-coverage-in-snapshot-…

…tests test: backport sleep coverage and determinism support
chronicleworks · Jul 22, 2023 · 3ff9cb9 · 3ff9cb9
2 parents 1de3a10 + 06c2e90
commit 3ff9cb9
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,7 +59,7 @@ insta = { version = "1.26.0", features = ["redactions", "toml"] }
 iref = "2.2"
 iref-enum = "2.1"
 json-ld = { version = "0.14" }
-json-syntax = { version = "*", features = ["serde", "serde_json"] }
+json-syntax = { version = "0.9", features = ["serde", "serde_json"] }
 jsonschema = "0.17.0"
 jwtk = { version = "0.2.4", features = ["remote-jwks"] }
 k256 = { version = "0.11.3", features = [
@@ -79,7 +79,7 @@ mime = "0.3"
 mockito = "1.0.2"
 oauth2 = "4.4"
 opa = "0.9.0"
-openssl = "0.10.48"
+openssl = "0.10.55"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.17.0", features = [
   "rt-tokio",
@@ -120,7 +120,7 @@ structopt = "0.3.26"
 temp-dir = "0.1.11"
 tempfile = "3.4.0"
 testcontainers = "0.14"
-thiserror = "1.0.38"
+thiserror = "1.0"
 tokio = { version = "1.27", features = [
   "time",
   "macros",

diff --git a/crates/api/src/chronicle_graphql/mod.rs b/crates/api/src/chronicle_graphql/mod.rs
@@ -15,8 +15,8 @@ use common::{
     ledger::{SubmissionError, SubmissionStage},
     opa::{ExecutorContext, OpaExecutorError},
     prov::{
-        to_json_ld::ToJson, ChronicleIri, ChronicleTransactionId, CompactedJson, ExternalId,
-        ExternalIdPart, ProvModel,
+        to_json_ld::ToJson, ChronicleIri, ChronicleTransactionId, ExternalId, ExternalIdPart,
+        ProvModel,
     },
 };
 use derivative::*;
@@ -839,7 +839,7 @@ impl IriEndpoint {
             Ok(()) => match self.store.connection() {
                 Ok(connection) => match retrieve(connection, id, ns) {
                     Ok(data) => match data.to_json().compact().await {
-                        Ok(CompactedJson(mut json)) => {
+                        Ok(mut json) => {
                             use serde_json::Value;
                             if let Value::Object(mut map) = json {
                                 map.insert(

diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
@@ -295,7 +295,7 @@ where
                 signer: signing.clone(),
                 ledger_writer: Arc::new(BlockingLedgerWriter::new(ledger)),
                 store: store.clone(),
-                uuid_source: PhantomData::default(),
+                uuid_source: PhantomData,
                 policy_name,
             };
 
@@ -338,7 +338,7 @@ where
                                   Some((ChronicleOperationEvent(Ok(ref commit), id,),tx,block_id,_position,_span )) => {
 
                                         debug!(committed = ?tx);
-                                        debug!(delta = %commit.to_json().compact().await.unwrap().pretty());
+                                        debug!(delta = %serde_json::to_string_pretty(&commit.to_json().compact().await.unwrap()).unwrap());
 
                                         api.sync( commit.clone().into(), &block_id,ChronicleTransactionId::from(tx.as_str()))
                                             .instrument(info_span!("Incoming confirmation", offset = ?block_id, tx_id = %tx))
@@ -1610,7 +1610,7 @@ mod test {
     use rand_core::SeedableRng;
     use sawtooth_sdk::messages::setting::{Setting, Setting_Entry};
 
-    use std::collections::HashMap;
+    use std::{collections::HashMap, time::Duration};
     use tempfile::TempDir;
     use uuid::Uuid;
 
@@ -1892,6 +1892,8 @@ mod test {
         }
         "###);
 
+        tokio::time::sleep(Duration::from_millis(1000)).await;
+
         // Check that the operations that do not result in data changes are not submitted
         insta::assert_json_snapshot!(api
             .dispatch(ApiCommand::Import(ImportCommand { namespace, operations } ), identity)
@@ -2256,6 +2258,8 @@ mod test {
         .await
         .unwrap();
 
+        tokio::time::sleep(Duration::from_millis(1000)).await;
+
         insta::assert_json_snapshot!(
         api.dispatch(ApiCommand::Activity(ActivityCommand::Start {
             id: ActivityId::from_external_id("testactivity"),
@@ -2362,6 +2366,8 @@ mod test {
         }
         "###);
 
+        tokio::time::sleep(Duration::from_millis(1000)).await;
+
         let res = api
             .dispatch(
                 ApiCommand::Agent(AgentCommand::Create {

diff --git a/crates/api/src/persistence/mod.rs b/crates/api/src/persistence/mod.rs
@@ -1,8 +1,4 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    str::FromStr,
-    time::Duration,
-};
+use std::{collections::BTreeMap, str::FromStr, time::Duration};
 
 use async_sawtooth_sdk::ledger::{BlockId, BlockIdError};
 use chrono::DateTime;
@@ -184,7 +180,7 @@ impl Store {
             attributes,
             ..
         }: &Activity,
-        ns: &HashMap<NamespaceId, Namespace>,
+        ns: &BTreeMap<NamespaceId, Namespace>,
     ) -> Result<(), StoreError> {
         use schema::activity as dsl;
         let _namespace = ns.get(namespaceid).ok_or(StoreError::InvalidNamespace {})?;
@@ -267,7 +263,7 @@ impl Store {
             attributes,
             ..
         }: &Agent,
-        ns: &HashMap<NamespaceId, Namespace>,
+        ns: &BTreeMap<NamespaceId, Namespace>,
     ) -> Result<(), StoreError> {
         use schema::agent::dsl;
         let _namespace = ns.get(namespaceid).ok_or(StoreError::InvalidNamespace {})?;
@@ -331,7 +327,7 @@ impl Store {
             signature_time,
             ..
         }: &Attachment,
-        ns: &HashMap<NamespaceId, Namespace>,
+        ns: &BTreeMap<NamespaceId, Namespace>,
     ) -> Result<(), StoreError> {
         let _namespace = ns.get(namespaceid).ok_or(StoreError::InvalidNamespace {})?;
         let (_, nsid) =
@@ -377,7 +373,7 @@ impl Store {
             domaintypeid,
             attributes,
         }: &Entity,
-        ns: &HashMap<NamespaceId, Namespace>,
+        ns: &BTreeMap<NamespaceId, Namespace>,
     ) -> Result<(), StoreError> {
         use schema::entity::dsl;
         let _namespace = ns.get(namespaceid).ok_or(StoreError::InvalidNamespace {})?;
@@ -543,7 +539,7 @@ impl Store {
             public_key,
             ..
         }: &Identity,
-        ns: &HashMap<NamespaceId, Namespace>,
+        ns: &BTreeMap<NamespaceId, Namespace>,
     ) -> Result<(), StoreError> {
         use schema::identity::dsl;
         let _namespace = ns.get(namespaceid).ok_or(StoreError::InvalidNamespace {})?;

diff --git a/crates/async-sawtooth-sdk/src/ledger.rs b/crates/async-sawtooth-sdk/src/ledger.rs
@@ -364,8 +364,8 @@ impl<
             builder,
             channel,
             last_seen_block: Default::default(),
-            _e: std::marker::PhantomData::default(),
-            _t: std::marker::PhantomData::default(),
+            _e: std::marker::PhantomData,
+            _t: std::marker::PhantomData,
         }
     }