Clean up

framework/instruments/src/lib.rs

@@ -9,7 +9,7 @@ mod report;
 
 pub mod prelude {
     pub use crate::report::{ReportCollector, ReportMetric};
-    pub use crate::{ReportConfig, Reporter, OperationRecord, report_operation};
+    pub use crate::{report_operation, OperationRecord, ReportConfig, Reporter};
 }
 
 #[derive(Default)]

framework/instruments/src/report.rs

@@ -1,9 +1,9 @@
 mod metrics_report;
 mod summary_report;
 
-use std::ops::Deref;
-use influxive_core::{Metric, StringType};
 use crate::OperationRecord;
+use influxive_core::{Metric, StringType};
+use std::ops::Deref;
 
 pub use metrics_report::MetricsReportCollector;
 pub use summary_report::SummaryReportCollector;

framework/instruments/src/report/metrics_report.rs

@@ -2,10 +2,10 @@ use crate::report::{ReportCollector, ReportMetric};
 use crate::OperationRecord;
 use anyhow::Context;
 use influxdb::{Client, InfluxDbWriteable, Timestamp, WriteQuery};
+use influxive_core::DataType;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::SystemTime;
-use influxive_core::DataType;
 use tokio::runtime::Runtime;
 use tokio::select;
 use tokio::sync::mpsc::UnboundedSender;
@@ -91,11 +91,13 @@ impl ReportCollector for MetricsReportCollector {
         let metric = metric.into_inner();
 
         let mut query = Timestamp::Nanoseconds(
-            metric.timestamp
+            metric
+                .timestamp
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
                 .as_nanos(),
-        ).into_query(metric.name.into_string());
+        )
+        .into_query(metric.name.into_string());
 
         for (k, v) in metric.fields {
             query = query.add_field(k.into_string(), v.into_type());

scenarios/dht_sync_lag/src/main.rs

@@ -1,10 +1,10 @@
-use std::collections::HashSet;
+use anyhow::anyhow;
 use holochain_types::prelude::{ActionHash, Record, Timestamp};
 use holochain_wind_tunnel_runner::prelude::*;
 use holochain_wind_tunnel_runner::scenario_happ_path;
+use std::collections::HashSet;
 use std::path::Path;
 use std::time::SystemTime;
-use anyhow::anyhow;
 use timed_integrity::TimedEntry;
 
 #[derive(Debug, Default)]
@@ -54,20 +54,41 @@ fn agent_behaviour_record_lag(
 ) -> HookResult {
     let found: Vec<Record> = call_zome(ctx, "timed", "get_timed_entries_local", ())?;
 
-    let found = found.into_iter().filter(|r| !ctx.get().scenario_values.seen_actions.contains(r.action_address())).collect::<Vec<_>>();
+    let found = found
+        .into_iter()
+        .filter(|r| {
+            !ctx.get()
+                .scenario_values
+                .seen_actions
+                .contains(r.action_address())
+        })
+        .collect::<Vec<_>>();
 
     let reporter_handle = ctx.runner_context().reporter().clone();
     for new_record in &found {
-        let timed_entry: TimedEntry = new_record.entry().to_app_option().map_err(|e| anyhow!("Failed to deserialize TimedEntry: {}", e))?.unwrap();
+        let timed_entry: TimedEntry = new_record
+            .entry()
+            .to_app_option()
+            .map_err(|e| anyhow!("Failed to deserialize TimedEntry: {}", e))?
+            .unwrap();
 
         let metric = ReportMetric::new("dht_sync_lag");
-        let lag_ms = (metric.timestamp.clone().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_micros() - timed_entry.created_at.as_micros() as u128) as f64 / 1000.0;
-        let metric = metric
-            .with_field("value", lag_ms);
+        let lag_ms = (metric
+            .timestamp
+            .clone()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap()
+            .as_micros()
+            - timed_entry.created_at.as_micros() as u128) as f64
+            / 1000.0;
+        let metric = metric.with_field("value", lag_ms);
 
         reporter_handle.add_custom(metric);
 
-        ctx.get_mut().scenario_values.seen_actions.insert(new_record.action_address().clone());
+        ctx.get_mut()
+            .scenario_values
+            .seen_actions
+            .insert(new_record.action_address().clone());
     }
 
     let metric = ReportMetric::new("dht_sync_recv_count")

zomes/crud/coordinator/Cargo.toml

@@ -3,7 +3,6 @@ name = "crud"
 version = "0.1.0"
 edition = "2021"
 description = "A Holochain coordinator zome for CRUD"
-build = "../../wasm_build.rs"
 
 [lib]
 name = "crud_coordinator"

zomes/crud/integrity/Cargo.toml

@@ -3,7 +3,6 @@ name = "crud_integrity"
 version = "0.1.0"
 edition = "2021"
 description = "A Holochain integrity zome for CRUD"
-build = "../../wasm_build.rs"
 
 [lib]
 name = "crud_integrity"

zomes/return_single_value/coordinator/Cargo.toml

@@ -3,7 +3,6 @@ name = "return_single_value"
 version = "0.1.0"
 edition = "2021"
 description = "A Holochain zome with a single zome function 'get_value' that returns 5"
-build = "../../wasm_build.rs"
 
 [lib]
 name = "return_single_value_coordinator"

zomes/timed/coordinator/src/lib.rs

@@ -1,13 +1,18 @@
-use hdk::prelude::*;
 use hdk::prelude::holo_hash::blake2b_256;
 use hdk::prelude::holo_hash::hash_type::AnyLinkable;
+use hdk::prelude::*;
 use timed_integrity::{EntryTypes, LinkTypes, TimedEntry};
 
 #[hdk_extern]
 fn created_timed_entry(timed: TimedEntry) -> ExternResult<ActionHash> {
     let action_hash = create_entry(EntryTypes::TimedEntry(timed))?;
 
-    create_link(fixed_base(), action_hash.clone(), LinkTypes::FixedToTimedEntry, ())?;
+    create_link(
+        fixed_base(),
+        action_hash.clone(),
+        LinkTypes::FixedToTimedEntry,
+        (),
+    )?;
 
     Ok(action_hash)
 }
@@ -19,7 +24,10 @@ fn get_timed_entries_local(_: ()) -> ExternResult<Vec<Record>> {
 
     let mut records = Vec::new();
     for link in links {
-        let action_hash: ActionHash = link.target.try_into().map_err(|_| wasm_error!(WasmErrorInner::Guest("Not an action hash".to_string())))?;
+        let action_hash: ActionHash = link
+            .target
+            .try_into()
+            .map_err(|_| wasm_error!(WasmErrorInner::Guest("Not an action hash".to_string())))?;
         // Try to stay local
         let record = get(action_hash, GetOptions::content())?;
         if let Some(record) = record {