Merge pull request #2246 from jacderida/chore-rename_autonomi_cli2

chore: rename autonomi crate and binary
maidsafe · Oct 15, 2024 · 567200e · 567200e
2 parents 147ba8e + c338819
commit 567200e
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/generate-benchmark-charts.yml b/.github/workflows/generate-benchmark-charts.yml
@@ -15,7 +15,7 @@ permissions:
 env:
   CARGO_INCREMENTAL: "0"
   RUST_BACKTRACE: 1
-  CLIENT_DATA_PATH: /home/runner/.local/share/safe/autonomi_cli
+  CLIENT_DATA_PATH: /home/runner/.local/share/safe/autonomi
   NODE_DATA_PATH: /home/runner/.local/share/safe/node
 
 jobs:
@@ -46,7 +46,7 @@ jobs:
         run: wget https://sn-node.s3.eu-west-2.amazonaws.com/the-test-data.zip
 
       - name: Build node and cli binaries
-        run: cargo build --release --features local --bin safenode --bin autonomi_cli
+        run: cargo build --release --features local --bin safenode --bin autonomi
         timeout-minutes: 30
 
       - name: Start a local network
@@ -67,7 +67,7 @@ jobs:
         # Criterion outputs the actual bench results to stderr "2>&1 tee output.txt" takes stderr,
         # passes to tee which displays it in the terminal and writes to output.txt
         run: |
-          cargo criterion --features=local --message-format=json 2>&1 -p autonomi_cli | tee -a output.txt
+          cargo criterion --features=local --message-format=json 2>&1 -p autonomi | tee -a output.txt
           cat output.txt | rg benchmark-complete | jq -s 'map({
             name: (.id | split("/"))[-1],
             unit: "MiB/s",
@@ -100,7 +100,7 @@ jobs:
 
       - name: Start a client instance to compare memory usage
         shell: bash
-        run: cargo run --bin autonomi_cli --release -- --log-output-dest=data-dir file upload the-test-data.zip
+        run: cargo run --bin autonomi --release -- --log-output-dest=data-dir file upload the-test-data.zip
         env:
           SN_LOG: "all"
 

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -160,7 +160,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features local --bin safenode --bin autonomi_cli
+        run: cargo build --release --features local --bin safenode --bin autonomi
         timeout-minutes: 30
 
       - name: Start a local network
@@ -207,13 +207,13 @@ jobs:
         shell: pwsh
 
       - name: Get file cost
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir file cost "./resources"
+        run: ./target/release/autonomi --log-output-dest=data-dir file cost "./resources"
         env:
           SN_LOG: "v"
         timeout-minutes: 15
 
       - name: File upload
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
+        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 15
@@ -233,16 +233,16 @@ jobs:
         shell: pwsh
 
       - name: File Download
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
+        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Generate register signing key
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register generate-key
+        run: ./target/release/autonomi --log-output-dest=data-dir register generate-key
 
       - name: Create register (writeable by owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
+        run: ./target/release/autonomi --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -262,25 +262,25 @@ jobs:
         shell: pwsh
 
       - name: Get register
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit register
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
+        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get register (after edit)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Create Public Register (writeable by anyone)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
+        run: ./target/release/autonomi --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -300,13 +300,13 @@ jobs:
         shell: pwsh
 
       - name: Get Public Register (current key is the owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit Public Register (current key is the owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
+        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -316,22 +316,22 @@ jobs:
         run: rm -rf ${{ matrix.safe_path }}/client
 
       - name: Generate new register signing key
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register generate-key
+        run: ./target/release/autonomi --log-output-dest=data-dir register generate-key
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: Edit Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
+        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi_cli --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,15 +2,11 @@
 resolver = "2"
 members = [
     "autonomi",
-    "autonomi_cli",
+    "autonomi-cli",
     "evmlib",
     "evm_testnet",
-    # "sn_auditor",
     "sn_build_info",
     "sn_evm",
-    # "sn_cli",
-    # "sn_client",
-    # "sn_faucet",
     "sn_logging",
     "sn_metrics",
     "nat-detection",

diff --git a/README.md b/README.md
@@ -158,15 +158,15 @@ To upload a file or a directory, you need to set the `SECRET_KEY` environment va
 > When running a local network, you can use the `SECRET_KEY` printed by the `evm_testnet` command [step 2](#2-run-a-local-evm-node) as it has all the money.
 
 ```bash
-SECRET_KEY=<YOUR_EVM_SECRET_KEY> cargo run --bin autonomi_cli --features local -- file upload <path>
+SECRET_KEY=<YOUR_EVM_SECRET_KEY> cargo run --bin autonomi --features local -- file upload <path>
 ```
 
 The output will print out the address at which the content was uploaded.
 
 Now to download the files again:
 
 ```bash
-cargo run --bin autonomi_cli --features local -- file download <addr> <dest_path>
+cargo run --bin autonomi --features local -- file download <addr> <dest_path>
 ```
 
 ### Registers

diff --git a/autonomi_cli/Cargo.toml → autonomi-cli/Cargo.toml b/autonomi_cli/Cargo.toml → autonomi-cli/Cargo.toml
@@ -1,8 +1,12 @@
 [package]
-name = "autonomi_cli"
+name = "autonomi-cli"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+name = "autonomi"
+path = "src/main.rs"
+
 [features]
 default = ["metrics"]
 local = ["sn_peers_acquisition/local", "autonomi/local"]

diff --git a/autonomi_cli/README.md → autonomi-cli/README.md b/autonomi_cli/README.md → autonomi-cli/README.md
diff --git a/autonomi_cli/benches/files.rs → autonomi-cli/benches/files.rs b/autonomi_cli/benches/files.rs → autonomi-cli/benches/files.rs
diff --git a/autonomi_cli/src/access/data_dir.rs → autonomi-cli/src/access/data_dir.rs b/autonomi_cli/src/access/data_dir.rs → autonomi-cli/src/access/data_dir.rs
diff --git a/autonomi_cli/src/access/keys.rs → autonomi-cli/src/access/keys.rs b/autonomi_cli/src/access/keys.rs → autonomi-cli/src/access/keys.rs
diff --git a/autonomi_cli/src/access/mod.rs → autonomi-cli/src/access/mod.rs b/autonomi_cli/src/access/mod.rs → autonomi-cli/src/access/mod.rs
diff --git a/autonomi_cli/src/access/network.rs → autonomi-cli/src/access/network.rs b/autonomi_cli/src/access/network.rs → autonomi-cli/src/access/network.rs
diff --git a/autonomi_cli/src/actions/connect.rs → autonomi-cli/src/actions/connect.rs b/autonomi_cli/src/actions/connect.rs → autonomi-cli/src/actions/connect.rs
diff --git a/autonomi_cli/src/actions/download.rs → autonomi-cli/src/actions/download.rs b/autonomi_cli/src/actions/download.rs → autonomi-cli/src/actions/download.rs
diff --git a/autonomi_cli/src/actions/mod.rs → autonomi-cli/src/actions/mod.rs b/autonomi_cli/src/actions/mod.rs → autonomi-cli/src/actions/mod.rs
diff --git a/autonomi_cli/src/actions/progress_bar.rs → autonomi-cli/src/actions/progress_bar.rs b/autonomi_cli/src/actions/progress_bar.rs → autonomi-cli/src/actions/progress_bar.rs
diff --git a/autonomi_cli/src/commands.rs → autonomi-cli/src/commands.rs b/autonomi_cli/src/commands.rs → autonomi-cli/src/commands.rs
diff --git a/autonomi_cli/src/commands/file.rs → autonomi-cli/src/commands/file.rs b/autonomi_cli/src/commands/file.rs → autonomi-cli/src/commands/file.rs
diff --git a/autonomi_cli/src/commands/register.rs → autonomi-cli/src/commands/register.rs b/autonomi_cli/src/commands/register.rs → autonomi-cli/src/commands/register.rs
diff --git a/autonomi_cli/src/commands/vault.rs → autonomi-cli/src/commands/vault.rs b/autonomi_cli/src/commands/vault.rs → autonomi-cli/src/commands/vault.rs
diff --git a/autonomi_cli/src/main.rs → autonomi-cli/src/main.rs b/autonomi_cli/src/main.rs → autonomi-cli/src/main.rs
@@ -51,7 +51,7 @@ fn init_logging_and_metrics(opt: &Opt) -> Result<(ReloadHandle, Option<WorkerGua
     let logging_targets = vec![
         ("sn_networking".to_string(), Level::INFO),
         ("sn_build_info".to_string(), Level::TRACE),
-        ("autonomi_cli".to_string(), Level::TRACE),
+        ("autonomi-cli".to_string(), Level::TRACE),
         ("sn_logging".to_string(), Level::TRACE),
         ("sn_peers_acquisition".to_string(), Level::TRACE),
         ("sn_protocol".to_string(), Level::TRACE),

diff --git a/autonomi_cli/src/opt.rs → autonomi-cli/src/opt.rs b/autonomi_cli/src/opt.rs → autonomi-cli/src/opt.rs
diff --git a/autonomi_cli/src/utils.rs → autonomi-cli/src/utils.rs b/autonomi_cli/src/utils.rs → autonomi-cli/src/utils.rs
diff --git a/sn_logging/src/lib.rs b/sn_logging/src/lib.rs
@@ -268,7 +268,7 @@ impl LogBuilder {
                 let timestamp = chrono::Local::now().format("%Y-%m-%d_%H-%M-%S").to_string();
                 let path = dir
                     .join("safe")
-                    .join("autonomi_cli")
+                    .join("autonomi")
                     .join("logs")
                     .join(format!("log_{timestamp}"));
                 LogOutputDest::Path(path)