sort and lint

buffalu · Jan 31, 2024 · f928211 · f928211
1 parent 61f5a8b
commit f928211
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,6 @@ members = [
     "dos",
     "download-utils",
     "entry",
-    "hook-service",
     "faucet",
     "frozen-abi",
     "frozen-abi/macro",
@@ -41,6 +40,7 @@ members = [
     "geyser-plugin-interface",
     "geyser-plugin-manager",
     "gossip",
+    "hook-service",
     "install",
     "keygen",
     "ledger",

diff --git a/validator/Cargo.toml b/validator/Cargo.toml
@@ -40,11 +40,11 @@ solana-core = { workspace = true }
 solana-download-utils = { workspace = true }
 solana-entry = { workspace = true }
 solana-faucet = { workspace = true }
-solana-hook-service-proto = { workspace = true }
 solana-genesis-utils = { workspace = true }
 solana-geyser-plugin-interface = { workspace = true }
 solana-geyser-plugin-manager = { workspace = true }
 solana-gossip = { workspace = true }
+solana-hook-service-proto = { workspace = true }
 solana-ledger = { workspace = true }
 solana-logger = { workspace = true }
 solana-metrics = { workspace = true }

diff --git a/validator/src/hook_service.rs b/validator/src/hook_service.rs
@@ -1,21 +1,18 @@
-use solana_hook_service_proto::hook_service::hook_service_server::{
-    HookService, HookServiceServer,
+use {
+    solana_hook_service_proto::hook_service::{
+        hook_service_server::{HookService, HookServiceServer},
+        EnableTpuRequest, EnableTpuResponse, MarkAccountsForDiscardRequest,
+        MarkAccountsForDiscardResponse, SendBundleRequest, SendBundleResponse, SendPacketsRequest,
+        SendPacketsResponse, SetMaxComputeRequest, SetMaxComputeResponse,
+        SetShredForwarderAddressRequest, SetShredForwarderAddressResponse, SetTpuAddressRequest,
+        SetTpuAddressResponse,
+    },
+    std::path::{Path, PathBuf},
+    thiserror::Error,
+    tokio::{fs::create_dir_all, net::UnixListener, task::JoinHandle},
+    tokio_stream::wrappers::{ReceiverStream, UnixListenerStream},
+    tonic::{async_trait, transport::Server, Request, Response, Status, Streaming},
 };
-use solana_hook_service_proto::hook_service::{
-    EnableTpuRequest, EnableTpuResponse, MarkAccountsForDiscardRequest,
-    MarkAccountsForDiscardResponse, SendBundleRequest, SendBundleResponse, SendPacketsRequest,
-    SendPacketsResponse, SetMaxComputeRequest, SetMaxComputeResponse,
-    SetShredForwarderAddressRequest, SetShredForwarderAddressResponse, SetTpuAddressRequest,
-    SetTpuAddressResponse,
-};
-use std::path::{Path, PathBuf};
-use thiserror::Error;
-use tokio::fs::create_dir_all;
-use tokio::net::UnixListener;
-use tokio::task::JoinHandle;
-use tokio_stream::wrappers::{ReceiverStream, UnixListenerStream};
-use tonic::transport::Server;
-use tonic::{async_trait, Request, Response, Status, Streaming};
 
 #[derive(Debug, Error)]
 pub enum HookServiceError {