fix: post-rebase tweaks

.integration/tests/metrics/mod.rs

@@ -16,8 +16,8 @@
 
 use crate::wait_until;
 
+use snarkos_integration::{ClientNode, TestNode};
 use snarkos_metrics as metrics;
-use snarkos_testing::{ClientNode, TestNode};
 
 use pea2pea::Pea2Pea;
 

Cargo.toml

@@ -31,9 +31,9 @@ required-features = ["console"]
 default = [ "console", "rpc" ]
 console = [ "crossterm", "tui" ]
 cuda = [ "snarkvm/cuda" ]
-prometheus = [ "snarkos-metrics/prometheus" ]
+prometheus = [ "snarkos-metrics/prometheus", "snarkos-network/prometheus" ]
 rpc = [ "snarkos-rpc" ]
-test = [ "snarkos-metrics/test" ]
+test = [ "snarkos-metrics/test", "snarkos-network/test" ]
 
 [dependencies.aleo-std]
 version = "0.1.6"

network/Cargo.toml

@@ -42,6 +42,11 @@ version = "1"
 path = "../environment"
 version = "2.0.2"
 
+[dependencies.snarkos-metrics]
+path = "../metrics"
+version = "2.0.2"
+optional = true
+
 [dependencies.snarkos-storage]
 path = "../storage"
 version = "2.0.2"
@@ -76,4 +81,5 @@ version = "0.1"
 
 [features]
 default = [ ]
-test = [ ]
+prometheus = [ "snarkos-metrics/prometheus" ]
+test = [ "snarkos-metrics/test" ]

snarkos/server.rs

@@ -431,7 +431,7 @@ impl<N: Network, E: Environment> Server<N, E> {
     fn initialize_metrics(ledger: LedgerReader<N>) {
         #[cfg(not(feature = "test"))]
         if let Some(handler) = snarkos_metrics::initialize() {
-            E::tasks().append(handler);
+            E::resources().register_task(handler);
         }
 
         // Set the block height as it could already be non-zero.