errors after fns

Author: Eric Swanson

bin/icp-cli/src/commands.rs

@@ -15,15 +15,15 @@ pub enum Subcmd {
     Network(network::Cmd),
 }
 
-#[derive(Debug, Snafu)]
-pub enum DispatchError {
-    #[snafu(transparent)]
-    Network { source: NetworkCommandError },
-}
-
 pub async fn dispatch(cli: Cli) -> Result<(), DispatchError> {
     match cli.subcommand {
         Subcmd::Network(opts) => network::dispatch(opts).await?,
     }
     Ok(())
 }
+
+#[derive(Debug, Snafu)]
+pub enum DispatchError {
+    #[snafu(transparent)]
+    Network { source: NetworkCommandError },
+}

bin/icp-cli/src/commands/network.rs

@@ -1,4 +1,4 @@
-use crate::commands::network::run::RunNetworkError;
+use crate::commands::network::run::RunNetworkCommandError;
 use clap::{Parser, Subcommand};
 use snafu::Snafu;
 
@@ -15,14 +15,15 @@ pub enum Subcmd {
     Run(run::Cmd),
 }
 
-#[derive(Debug, Snafu)]
-pub enum NetworkCommandError {
-    #[snafu(transparent)]
-    Run { source: RunNetworkError },
-}
 pub async fn dispatch(cmd: Cmd) -> Result<(), NetworkCommandError> {
     match cmd.subcmd {
         Subcmd::Run(cmd) => run::exec(cmd).await?,
     }
     Ok(())
 }
+
+#[derive(Debug, Snafu)]
+pub enum NetworkCommandError {
+    #[snafu(transparent)]
+    Run { source: RunNetworkCommandError },
+}

bin/icp-cli/src/commands/network/run.rs

@@ -1,24 +1,16 @@
+use crate::commands::network::run::RunNetworkCommandError::ProjectStructureNotFound;
 use crate::project::structure::ProjectDirectoryStructure;
 use clap::Parser;
-use icp_network::{ManagedNetworkModel, StartLocalNetworkError, run_network};
+use icp_network::{ManagedNetworkModel, RunNetworkError, run_network};
 use snafu::Snafu;
 
 /// Run the local network
 #[derive(Parser, Debug)]
 pub struct Cmd {}
 
-#[derive(Debug, Snafu)]
-pub enum RunNetworkError {
-    #[snafu(display("no project (icp.yaml) found in current directory or its parents"))]
-    ProjectStructureNotFound,
-
-    #[snafu(transparent)]
-    NetworkExecutionFailed { source: StartLocalNetworkError },
-}
-
-pub async fn exec(_cmd: Cmd) -> Result<(), RunNetworkError> {
+pub async fn exec(_cmd: Cmd) -> Result<(), RunNetworkCommandError> {
     let config = ManagedNetworkModel::default();
-    let ps = ProjectDirectoryStructure::find().ok_or(RunNetworkError::ProjectStructureNotFound)?;
+    let ps = ProjectDirectoryStructure::find().ok_or(ProjectStructureNotFound)?;
     eprintln!("Project root: {}", ps.root().display());
 
     let nds = ps.network("local");
@@ -28,3 +20,12 @@ pub async fn exec(_cmd: Cmd) -> Result<(), RunNetworkError> {
 
     Ok(())
 }
+
+#[derive(Debug, Snafu)]
+pub enum RunNetworkCommandError {
+    #[snafu(display("no project (icp.yaml) found in current directory or its parents"))]
+    ProjectStructureNotFound,
+
+    #[snafu(transparent)]
+    NetworkExecutionFailed { source: RunNetworkError },
+}

lib/icp-fs/src/directories.rs

@@ -1,3 +1,2 @@
-pub mod directories;
 pub mod fs;
 pub mod json;

lib/icp-fs/src/lib.rs

@@ -5,5 +5,5 @@ pub mod structure;
 
 pub use config::model::managed::ManagedNetworkModel;
 pub use config::model::network_config::NetworkConfig;
-pub use managed::run::StartLocalNetworkError;
+pub use managed::run::RunNetworkError;
 pub use managed::run::run_network;

lib/icp-network/src/lib.rs

@@ -13,30 +13,6 @@ pub struct PocketIcAdminInterface {
     base_url: Url,
 }
 
-#[derive(Debug, Snafu)]
-pub enum CreateInstanceError {
-    #[snafu(
-        display("failed to create PocketIC instance: {message}"),
-        context(suffix(InstanceSnafu))
-    )]
-    Create { message: String },
-
-    #[snafu(transparent)]
-    Reqwest { source: reqwest::Error },
-}
-
-#[derive(Debug, Snafu)]
-pub enum CreateHttpGatewayError {
-    #[snafu(
-        display("failed to create HTTP gateway: {message}"),
-        context(suffix(GatewaySnafu))
-    )]
-    Create { message: String },
-
-    #[snafu(transparent, context(false))]
-    Reqwest { source: reqwest::Error },
-}
-
 impl PocketIcAdminInterface {
     pub fn new(base_url: Url) -> Self {
         let client = reqwest::Client::new();
@@ -143,3 +119,27 @@ impl PocketIcAdminInterface {
         }
     }
 }
+
+#[derive(Debug, Snafu)]
+pub enum CreateInstanceError {
+    #[snafu(
+        display("failed to create PocketIC instance: {message}"),
+        context(suffix(InstanceSnafu))
+    )]
+    Create { message: String },
+
+    #[snafu(transparent)]
+    Reqwest { source: reqwest::Error },
+}
+
+#[derive(Debug, Snafu)]
+pub enum CreateHttpGatewayError {
+    #[snafu(
+        display("failed to create HTTP gateway: {message}"),
+        context(suffix(GatewaySnafu))
+    )]
+    Create { message: String },
+
+    #[snafu(transparent, context(false))]
+    Reqwest { source: reqwest::Error },
+}