.

near · Jan 17, 2025 · 2fa3fc7 · 2fa3fc7
1 parent e426240
commit 2fa3fc7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/network/Cargo.toml b/chain/network/Cargo.toml
@@ -63,7 +63,6 @@ near-store.workspace = true
 near-schema-checker-lib.workspace = true
 
 [dev-dependencies]
-near-chain.workspace = true
 assert_matches.workspace = true
 bolero.workspace = true
 criterion.workspace = true
@@ -77,27 +76,29 @@ serde_json.workspace = true
 
 [features]
 nightly_protocol = [
-    "near-async/nightly_protocol",
-    "near-chain-configs/nightly_protocol",
-    "near-fmt/nightly_protocol",
-    "near-o11y/nightly_protocol",
-    "near-primitives/nightly_protocol",
-    "near-store/nightly_protocol",
+  "near-async/nightly_protocol",
+  "near-chain-configs/nightly_protocol",
+  "near-fmt/nightly_protocol",
+  "near-o11y/nightly_protocol",
+  "near-primitives/nightly_protocol",
+  "near-store/nightly_protocol",
 ]
 nightly = [
-    "near-async/nightly",
-    "near-chain-configs/nightly",
-    "near-fmt/nightly",
-    "near-o11y/nightly",
-    "near-primitives/nightly",
-    "near-store/nightly",
-    "nightly_protocol",
+  "near-async/nightly",
+  "near-chain-configs/nightly",
+  "near-fmt/nightly",
+  "near-o11y/nightly",
+  "near-primitives/nightly",
+  "near-store/nightly",
+  "nightly_protocol",
+]
+performance_stats = [
+    "near-performance-metrics/performance_stats",
 ]
-performance_stats = ["near-performance-metrics/performance_stats"]
 test_features = []
 protocol_schema = [
-    "near-schema-checker-lib/protocol_schema",
-    "near-crypto/protocol_schema",
-    "near-primitives/protocol_schema",
-    "near-store/protocol_schema",
+  "near-schema-checker-lib/protocol_schema",
+  "near-crypto/protocol_schema",
+  "near-primitives/protocol_schema",
+  "near-store/protocol_schema",
 ]
diff --git a/integration-tests/src/tests/network/runner.rs b/integration-tests/src/tests/network/runner.rs
@@ -2,7 +2,7 @@ use actix::{Actor, Addr};
 use anyhow::{anyhow, bail, Context};
 use near_async::actix::AddrWithAutoSpanContextExt;
 use near_async::actix_wrapper::{spawn_actix_actor, ActixWrapper};
-use near_async::futures::{ActixFutureSpawner, StdThreadAsyncComputationSpawnerForTest};
+use near_async::futures::ActixFutureSpawner;
 use near_async::messaging::{noop, IntoMultiSender, IntoSender, LateBoundSender};
 use near_async::time::{self, Clock};
 use near_chain::rayon_spawner::RayonAsyncComputationSpawner;
@@ -160,7 +160,7 @@ fn setup_network_node(
         shards_manager_adapter.as_sender(),
         partial_witness_actor.with_auto_span_context().into_multi_sender(),
         genesis_id,
-        Arc::new(StdThreadAsyncComputationSpawnerForTest),
+        Arc::new(RayonAsyncComputationSpawner),
     )
     .unwrap();
     network_adapter.bind(peer_manager.clone().with_auto_span_context());

diff --git a/integration-tests/src/tests/network/stress_network.rs b/integration-tests/src/tests/network/stress_network.rs
@@ -4,8 +4,8 @@ use std::time::Duration;
 
 use actix::{Actor, AsyncContext, System};
 use futures::FutureExt;
-use near_async::futures::StdThreadAsyncComputationSpawnerForTest;
 use near_async::messaging::{noop, IntoMultiSender, IntoSender};
+use near_chain::rayon_spawner::RayonAsyncComputationSpawner;
 use tracing::info;
 
 use near_actix_test_utils::run_actix;
@@ -35,7 +35,7 @@ fn make_peer_manager(
         noop().into_sender(),
         noop().into_multi_sender(),
         GenesisId::default(),
-        Arc::new(StdThreadAsyncComputationSpawnerForTest),
+        Arc::new(RayonAsyncComputationSpawner),
     )
     .unwrap()
 }

diff --git a/tools/chainsync-loadtest/src/main.rs b/tools/chainsync-loadtest/src/main.rs
@@ -4,12 +4,12 @@ mod network;
 
 use anyhow::{anyhow, Context};
 use near_async::actix::AddrWithAutoSpanContextExt;
-use near_async::futures::StdThreadAsyncComputationSpawnerForTest;
 use near_async::messaging::noop;
 use near_async::messaging::IntoMultiSender;
 use near_async::messaging::IntoSender;
 use near_async::messaging::LateBoundSender;
 use near_async::time;
+use near_chain::rayon_spawner::RayonAsyncComputationSpawner;
 use near_chain_configs::Genesis;
 use near_chain_configs::MutableConfigValue;
 use near_network::concurrency::ctx;
@@ -52,7 +52,7 @@ pub fn start_with_config(config: NearConfig, qps_limit: u32) -> anyhow::Result<A
             chain_id: config.client_config.chain_id.clone(),
             hash: genesis_hash(&config.client_config.chain_id),
         },
-        Arc::new(StdThreadAsyncComputationSpawnerForTest),
+        Arc::new(RayonAsyncComputationSpawner),
     )
     .context("PeerManagerActor::spawn()")?;
     network_adapter.bind(network_actor.with_auto_span_context());