From 9c3b99f719c595fb7c65ff573ab7fa4429dcd8b0 Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Thu, 20 Jul 2023 14:47:47 +0100 Subject: [PATCH] more tidy up --- file_store/src/file_info_poller.rs | 4 ++-- iot_verifier/src/entropy_loader.rs | 4 ++-- iot_verifier/src/gateway_updater.rs | 4 ++-- iot_verifier/src/loader.rs | 4 ++-- iot_verifier/src/packet_loader.rs | 4 ++-- iot_verifier/src/purger.rs | 4 ++-- iot_verifier/src/rewarder.rs | 4 ++-- iot_verifier/src/runner.rs | 4 ++-- iot_verifier/src/tx_scaler.rs | 4 ++-- task_manager/src/lib.rs | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/file_store/src/file_info_poller.rs b/file_store/src/file_info_poller.rs index b357151d2..af7a8f34f 100644 --- a/file_store/src/file_info_poller.rs +++ b/file_store/src/file_info_poller.rs @@ -79,9 +79,9 @@ where { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - let handle = tokio::spawn(self.run(shutdown_listener)); + let handle = tokio::spawn(self.run(shutdown)); Box::pin( handle diff --git a/iot_verifier/src/entropy_loader.rs b/iot_verifier/src/entropy_loader.rs index a138d7610..dae5c5e28 100644 --- a/iot_verifier/src/entropy_loader.rs +++ b/iot_verifier/src/entropy_loader.rs @@ -22,9 +22,9 @@ pub enum NewLoaderError { impl ManagedTask for EntropyLoader { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/gateway_updater.rs b/iot_verifier/src/gateway_updater.rs index 5140b50b2..53eaf28b8 100644 --- a/iot_verifier/src/gateway_updater.rs +++ b/iot_verifier/src/gateway_updater.rs @@ -34,9 +34,9 @@ pub enum GatewayUpdaterError { impl ManagedTask for GatewayUpdater { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/loader.rs b/iot_verifier/src/loader.rs index e31385c44..09d1ad6fc 100644 --- a/iot_verifier/src/loader.rs +++ b/iot_verifier/src/loader.rs @@ -60,9 +60,9 @@ pub enum ValidGatewayResult { impl ManagedTask for Loader { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/packet_loader.rs b/iot_verifier/src/packet_loader.rs index d93a4032d..a7d5c5d9e 100644 --- a/iot_verifier/src/packet_loader.rs +++ b/iot_verifier/src/packet_loader.rs @@ -30,9 +30,9 @@ pub enum NewLoaderError { impl ManagedTask for PacketLoader { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/purger.rs b/iot_verifier/src/purger.rs index c6a169815..5f435b897 100644 --- a/iot_verifier/src/purger.rs +++ b/iot_verifier/src/purger.rs @@ -50,9 +50,9 @@ pub struct NewPurgerError(#[from] db_store::Error); impl ManagedTask for Purger { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/rewarder.rs b/iot_verifier/src/rewarder.rs index ca9ed1641..b6e4aaa9c 100644 --- a/iot_verifier/src/rewarder.rs +++ b/iot_verifier/src/rewarder.rs @@ -29,9 +29,9 @@ pub struct Rewarder { impl ManagedTask for Rewarder { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/runner.rs b/iot_verifier/src/runner.rs index c728b6c17..20d2064d7 100644 --- a/iot_verifier/src/runner.rs +++ b/iot_verifier/src/runner.rs @@ -65,9 +65,9 @@ pub enum FilterStatus { impl ManagedTask for Runner { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/iot_verifier/src/tx_scaler.rs b/iot_verifier/src/tx_scaler.rs index 146987c73..8fb4709df 100644 --- a/iot_verifier/src/tx_scaler.rs +++ b/iot_verifier/src/tx_scaler.rs @@ -33,9 +33,9 @@ pub enum TxScalerError { impl ManagedTask for Server { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self.run(shutdown_listener)) + Box::pin(self.run(shutdown)) } } diff --git a/task_manager/src/lib.rs b/task_manager/src/lib.rs index b2402010d..916e5fe79 100644 --- a/task_manager/src/lib.rs +++ b/task_manager/src/lib.rs @@ -9,7 +9,7 @@ use tokio::signal; pub trait ManagedTask { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>>; } @@ -44,9 +44,9 @@ where { fn start_task( self: Box, - shutdown_listener: triggered::Listener, + shutdown: triggered::Listener, ) -> LocalBoxFuture<'static, anyhow::Result<()>> { - Box::pin(self(shutdown_listener)) + Box::pin(self(shutdown)) } }