Skip to content

Commit b133b2d

Browse files
committed
all: Simplify return type of SubgraphAssignmentProvider.stop
The method would never fil, so no reason to use a `Result`
1 parent a441339 commit b133b2d

File tree

5 files changed

+8
-24
lines changed

5 files changed

+8
-24
lines changed

core/src/subgraph/provider.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,11 @@ impl<I: SubgraphInstanceManager> SubgraphAssignmentProviderTrait for SubgraphAss
9191
);
9292
}
9393

94-
async fn stop(
95-
&self,
96-
deployment: DeploymentLocator,
97-
) -> Result<(), SubgraphAssignmentProviderError> {
94+
async fn stop(&self, deployment: DeploymentLocator) {
9895
// If subgraph ID was in set
9996
if self.deployment_registry.remove(&deployment.id) {
10097
// Shut down subgraph processing
10198
self.instance_manager.stop_subgraph(deployment).await;
10299
}
103-
Ok(())
104100
}
105101
}

core/src/subgraph/registrar.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -472,18 +472,13 @@ async fn handle_assignment_event(
472472
AssignmentEvent::Add {
473473
deployment,
474474
node_id: _,
475-
} => {
476-
provider.start(deployment, None).await;
477-
Ok(())
478-
}
475+
} => provider.start(deployment, None).await,
479476
AssignmentEvent::Remove {
480477
deployment,
481478
node_id: _,
482-
} => match provider.stop(deployment).await {
483-
Ok(()) => Ok(()),
484-
Err(e) => Err(CancelableError::Error(e)),
485-
},
479+
} => provider.stop(deployment).await,
486480
}
481+
Ok(())
487482
}
488483

489484
/// Resolves the subgraph's earliest block

graph/src/components/subgraph/provider.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ use crate::{components::store::DeploymentLocator, prelude::*};
66
#[async_trait]
77
pub trait SubgraphAssignmentProvider: Send + Sync + 'static {
88
async fn start(&self, deployment: DeploymentLocator, stop_block: Option<BlockNumber>);
9-
async fn stop(
10-
&self,
11-
deployment: DeploymentLocator,
12-
) -> Result<(), SubgraphAssignmentProviderError>;
9+
async fn stop(&self, deployment: DeploymentLocator);
1310
}

tests/src/fixture/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ impl TestContext {
282282

283283
pub async fn start_and_sync_to(&self, stop_block: BlockPtr) {
284284
// In case the subgraph has been previously started.
285-
self.provider.stop(self.deployment.clone()).await.unwrap();
285+
self.provider.stop(self.deployment.clone()).await;
286286

287287
self.provider
288288
.start(self.deployment.clone(), Some(stop_block.number))
@@ -302,7 +302,7 @@ impl TestContext {
302302

303303
pub async fn start_and_sync_to_error(&self, stop_block: BlockPtr) -> SubgraphError {
304304
// In case the subgraph has been previously started.
305-
self.provider.stop(self.deployment.clone()).await.unwrap();
305+
self.provider.stop(self.deployment.clone()).await;
306306

307307
self.provider.start(self.deployment.clone(), None).await;
308308

tests/tests/runner_tests.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ async fn data_source_revert() -> anyhow::Result<()> {
8282

8383
let stop_block = test_ptr(2);
8484
base_ctx.start_and_sync_to(stop_block).await;
85-
base_ctx
86-
.provider
87-
.stop(base_ctx.deployment.clone())
88-
.await
89-
.unwrap();
85+
base_ctx.provider.stop(base_ctx.deployment.clone()).await;
9086

9187
// Test loading data sources from DB.
9288
let stop_block = test_ptr(3);

0 commit comments

Comments
 (0)