fix(node): remove narwhal crates (#3779)

* fix(node): remove narwhal crates * fix(codeowners): remove fijter * fix(node): cyclic dependency * fix(node): fix dependencies * Remove comment Co-authored-by: Mirko Zichichi <[email protected]> * fix(node): move `TimestampMs` to iota-core and rename it to `CommitTimestampMs` * fix(node): rustfmt * fix(node): dependencies for simtests --------- Co-authored-by: Mirko Zichichi <[email protected]>
iotaledger · Oct 30, 2024 · 8db1d6a · 8db1d6a
1 parent ca4ea3e
commit 8db1d6a
Show file tree

Hide file tree

Showing 190 changed files with 2,653 additions and 21,500 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -36,7 +36,6 @@
 
 # core-consensus team
 /consensus/ @iotaledger/core-consensus
-/narwhal/ @iotaledger/core-consensus
 
 # dev-tools team
 /crates/iota/ @iotaledger/dev-tools
@@ -69,11 +68,11 @@ vercel.json @iotaledger/boxfish @iotaledger/tooling
 /docs/**/vercel.json @iotaledger/devx
 
 # CI Taskforce
-/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
-/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
+/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
+/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
 
 # Protect this CODEOWNERS file, with some fallback in case of unavailability
-/.github/CODEOWNERS @luca-moser @lzpap @miker83z @fijter
+/.github/CODEOWNERS @luca-moser @lzpap @miker83z @alexsporn
 
 # Scripts
 /scripts/dependency_graphs/ @muXxer

diff --git a/.github/actions/diffs/action.yml b/.github/actions/diffs/action.yml
@@ -27,7 +27,6 @@ runs:
             - "consensus/**"
             - "crates/**"
             - "external-crates/**"
-            - "narwhal/**"
             - "iota-execution/**"
             - "docs/examples/rust/**"
             - ".github/workflows/hierarchy.yml"
@@ -64,6 +63,5 @@ runs:
             - "docker/**"
             - "external-crates/**"
             - "kiosk/**"
-            - "narwhal/**"
             - "nre/**"
             - "iota-execution/**"
diff --git a/.github/crates-filters.yml b/.github/crates-filters.yml
@@ -170,16 +170,6 @@ typed-store-derive:
   - "crates/typed-store-derive/**"
 typed-store-error:
   - "crates/typed-store-error/**"
-narwhal-config:
-  - "narwhal/config/**"
-narwhal-crypto:
-  - "narwhal/crypto/**"
-narwhal-network:
-  - "narwhal/network/**"
-narwhal-test-utils:
-  - "narwhal/test-utils/**"
-narwhal-types:
-  - "narwhal/types/**"
 iota-execution:
   - "iota-execution/**"
 iota-execution-cut:

diff --git a/.github/workflows/release_notes_monitor.yml b/.github/workflows/release_notes_monitor.yml
@@ -33,7 +33,7 @@ jobs:
           export previous_tag=$(git tag | grep -E 'iota_v1(.*)_rel_notes' | sort -rV | head -1)
           export previous_commit_hash=$(git rev-list -n 1 ${previous_tag})
 
-          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk narwhal nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
+          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
 
           echo "matrix=${list_of_prs}" >> $GITHUB_OUTPUT
           echo "new_commit_hash=${new_commit_hash}" >> $GITHUB_OUTPUT

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -165,8 +165,6 @@ members = [
   "iota-execution/v0/iota-adapter",
   "iota-execution/v0/iota-move-natives",
   "iota-execution/v0/iota-verifier",
-  "narwhal/network",
-  "narwhal/types",
 ]
 
 [workspace.package]
@@ -462,8 +460,6 @@ move-vm-config = { path = "external-crates/move/crates/move-vm-config" }
 move-vm-profiler = { path = "external-crates/move/crates/move-vm-profiler" }
 move-vm-test-utils = { path = "external-crates/move/crates/move-vm-test-utils/", features = ["tiered-gas"] }
 move-vm-types = { path = "external-crates/move/crates/move-vm-types" }
-narwhal-network = { path = "narwhal/network" }
-narwhal-types = { path = "narwhal/types" }
 prometheus-closure-metric = { path = "crates/prometheus-closure-metric" }
 shared-crypto = { path = "crates/shared-crypto" }
 simulacrum = { path = "crates/simulacrum" }

diff --git a/crates/iota-aws-orchestrator/README.md b/crates/iota-aws-orchestrator/README.md
@@ -90,22 +90,7 @@ Instances listed with a green number are available and ready for use, while inst
 Also keep in mind that there is nothing stopping you from running the `deploy` command multiple times if you find your self
 needing more instances down the line.
 
-## Step 4. Choose protocol
-
-There is support to benchmark either Iota or Narwhal only. To choose which protocol to benchmark, you can set the `Protocol` & `BenchmarkType` field [here](https://github.com/iotaledger/iota/blob/develop/crates/iota-aws-orchestrator/src/main.rs#L33-L34)
-
-```
-// Iota
-use protocol::iota::{IotaBenchmarkType, IotaProtocol};
-type Protocol = IotaProtocol;
-type BenchmarkType = IotaBenchmarkType;
-// Narwhal
-use protocol::narwhal::{NarwhalBenchmarkType, NarwhalProtocol};
-type Protocol = NarwhalProtocol;
-type BenchmarkType = NarwhalBenchmarkType;
-```
-
-## Step 5. Running benchmarks
+## Step 4. Running benchmarks
 
 Running benchmarks involves installing the specified version of the codebase on the remote machines and running one validator and one load generator per instance. For example, the following command benchmarks a committee of 10 validators under a constant load of 200 tx/s for 3 minutes:
 
@@ -115,7 +100,7 @@ cargo run --bin iota-aws-orchestrator -- benchmark --committee 10 fixed-load --l
 
 In a network of 10 validators, each with a corresponding load generator, each load generator submits a fixed load of 20 tx/s. Performance measurements are collected by regularly scraping the Prometheus metrics exposed by the load generators. The `iota-aws-orchestrator` binary provides additional commands to run a specific number of load generators on separate machines.
 
-## Step 6. Monitoring
+## Step 5. Monitoring
 
 The orchestrator provides facilities to monitor metrics on clients and nodes. The orchestrator deploys a [Prometheus](https://prometheus.io) instance and a [Grafana](https://grafana.com) instance on a dedicated remote machine. Grafana is then available on the address printed on stdout (e.g., `http://3.83.97.12:3000`) with the default username and password both set to `admin`. You can either create a [new dashboard](https://grafana.com/docs/grafana/latest/getting-started/build-first-dashboard/) or [import](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard) the example dashboards located in the `./assets` folder.