Update snapshots and replace the linera_base dependency by a linera_v…

…iews one.
linera-io · Jul 12, 2024 · 2dbcd5d · 2dbcd5d
1 parent e3d621e
commit 2dbcd5d
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/linera-views-derive/src/lib.rs b/linera-views-derive/src/lib.rs
@@ -177,7 +177,7 @@ fn generate_view_code(input: ItemStruct, root: bool) -> TokenStream2 {
                 &context.base_key(),
             );
             #[cfg(not(target_arch = "wasm32"))]
-            use linera_base::prometheus_util::MeasureLatency as _;
+            use linera_views::prometheus_util::MeasureLatency as _;
             let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         }
     } else {

diff --git a/...s-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C.snap b/...s-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C.snap
@@ -72,7 +72,7 @@ where
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/...c/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C_with_where.snap b/...c/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C_with_where.snap
@@ -73,7 +73,7 @@ where
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/.../snapshots/linera_views_derive__tests__test_generate_view_code_metrics_CustomContext.snap b/.../snapshots/linera_views_derive__tests__test_generate_view_code_metrics_CustomContext.snap
@@ -83,7 +83,7 @@ impl linera_views::views::View<CustomContext> for TestView {
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/...linera_views_derive__tests__test_generate_view_code_metrics_CustomContext_with_where.snap b/...linera_views_derive__tests__test_generate_view_code_metrics_CustomContext_with_where.snap
@@ -86,7 +86,7 @@ where
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/...inera_views_derive__tests__test_generate_view_code_metrics_custom__GenericContext_T_.snap b/...inera_views_derive__tests__test_generate_view_code_metrics_custom__GenericContext_T_.snap
@@ -87,7 +87,7 @@ impl linera_views::views::View<custom::GenericContext<T>> for TestView {
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/..._derive__tests__test_generate_view_code_metrics_custom__GenericContext_T__with_where.snap b/..._derive__tests__test_generate_view_code_metrics_custom__GenericContext_T__with_where.snap
@@ -90,7 +90,7 @@ where
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/...a_views_derive__tests__test_generate_view_code_metrics_custom__path__to__ContextType.snap b/...a_views_derive__tests__test_generate_view_code_metrics_custom__path__to__ContextType.snap
@@ -87,7 +87,7 @@ impl linera_views::views::View<custom::path::to::ContextType> for TestView {
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/...ive__tests__test_generate_view_code_metrics_custom__path__to__ContextType_with_where.snap b/...ive__tests__test_generate_view_code_metrics_custom__path__to__ContextType_with_where.snap
@@ -91,7 +91,7 @@ where
             &context.base_key(),
         );
         #[cfg(not(target_arch = "wasm32"))]
-        use linera_base::prometheus_util::MeasureLatency as _;
+        use linera_views::prometheus_util::MeasureLatency as _;
         let _latency = linera_views::LOAD_VIEW_LATENCY.measure_latency();
         let keys = Self::pre_load(&context)?;
         let values = context.read_multi_values_bytes(keys).await?;

diff --git a/linera-views/src/lib.rs b/linera-views/src/lib.rs
@@ -60,10 +60,9 @@ The `LogView` can be seen as an analog of `VecDeque` while `MapView` is an analo
 #![deny(clippy::large_futures)]
 
 #[cfg(with_metrics)]
-use {
-    linera_base::{prometheus_util, sync::Lazy},
-    prometheus::IntCounterVec,
-};
+pub use linera_base::prometheus_util;
+#[cfg(with_metrics)]
+use {linera_base::sync::Lazy, prometheus::IntCounterVec};
 
 /// The definition of the batches for writing in the database.
 pub mod batch;