Deprecate mixnet v1 component simulations (#57)

logos-co · Dec 3, 2024 · 2b99275 · 2b99275
1 parent c600ebd
commit 2b99275
Show file tree

Hide file tree

Showing 70 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,8 +18,9 @@ jobs:
         with:
           submodules: true
       - name: Build
-        working-directory: mixnet
+        working-directory: simlib
         run: cargo build -v
-      - name: Unit tests
-        working-directory: mixnet
-        run: cargo test -v
+      # TODO: uncomment this after fixing tests
+      # - name: Unit tests
+      #   working-directory: simlib
+      #   run: cargo test -v
diff --git a/mixnet/.gitignore → deprecated/mixnet-v1/components/.gitignore b/mixnet/.gitignore → deprecated/mixnet-v1/components/.gitignore
diff --git a/mixnet/Cargo.toml → deprecated/mixnet-v1/components/Cargo.toml b/mixnet/Cargo.toml → deprecated/mixnet-v1/components/Cargo.toml
diff --git a/mixnet/README.md → deprecated/mixnet-v1/components/README.md b/mixnet/README.md → deprecated/mixnet-v1/components/README.md
@@ -1,4 +1,4 @@
-# Mixnet Simulations
+# Mixnet v1 Component Simulations
 
 ## Structure
 

diff --git a/mixnet/analysis/.gitignore → .../mixnet-v1/components/analysis/.gitignore b/mixnet/analysis/.gitignore → .../mixnet-v1/components/analysis/.gitignore
diff --git a/mixnet/analysis/README.md → ...d/mixnet-v1/components/analysis/README.md b/mixnet/analysis/README.md → ...d/mixnet-v1/components/analysis/README.md
diff --git a/mixnet/analysis/coeff.py → ...ed/mixnet-v1/components/analysis/coeff.py b/mixnet/analysis/coeff.py → ...ed/mixnet-v1/components/analysis/coeff.py
diff --git a/mixnet/analysis/common.py → ...d/mixnet-v1/components/analysis/common.py b/mixnet/analysis/common.py → ...d/mixnet-v1/components/analysis/common.py
diff --git a/mixnet/analysis/latency.py → .../mixnet-v1/components/analysis/latency.py b/mixnet/analysis/latency.py → .../mixnet-v1/components/analysis/latency.py
diff --git a/mixnet/analysis/requirements.txt → ...t-v1/components/analysis/requirements.txt b/mixnet/analysis/requirements.txt → ...t-v1/components/analysis/requirements.txt
diff --git a/mixnet/dissemination/Cargo.toml → ...et-v1/components/dissemination/Cargo.toml b/mixnet/dissemination/Cargo.toml → ...et-v1/components/dissemination/Cargo.toml
diff --git a/mixnet/dissemination/README.md → ...net-v1/components/dissemination/README.md b/mixnet/dissemination/README.md → ...net-v1/components/dissemination/README.md
diff --git a/mixnet/dissemination/src/iteration.rs → ...components/dissemination/src/iteration.rs b/mixnet/dissemination/src/iteration.rs → ...components/dissemination/src/iteration.rs
diff --git a/mixnet/dissemination/src/main.rs → ...t-v1/components/dissemination/src/main.rs b/mixnet/dissemination/src/main.rs → ...t-v1/components/dissemination/src/main.rs
diff --git a/mixnet/dissemination/src/paramset.rs → .../components/dissemination/src/paramset.rs b/mixnet/dissemination/src/paramset.rs → .../components/dissemination/src/paramset.rs
diff --git a/mixnet/ordering/Cargo.toml → .../mixnet-v1/components/ordering/Cargo.toml b/mixnet/ordering/Cargo.toml → .../mixnet-v1/components/ordering/Cargo.toml
diff --git a/mixnet/ordering/README.md → ...d/mixnet-v1/components/ordering/README.md b/mixnet/ordering/README.md → ...d/mixnet-v1/components/ordering/README.md
diff --git a/mixnet/ordering/src/bin/aggregate.rs → .../components/ordering/src/bin/aggregate.rs b/mixnet/ordering/src/bin/aggregate.rs → .../components/ordering/src/bin/aggregate.rs
diff --git a/mixnet/ordering/src/bin/coeff.rs → ...t-v1/components/ordering/src/bin/coeff.rs b/mixnet/ordering/src/bin/coeff.rs → ...t-v1/components/ordering/src/bin/coeff.rs
diff --git a/mixnet/ordering/src/bin/coeff_aggr.rs → ...components/ordering/src/bin/coeff_aggr.rs b/mixnet/ordering/src/bin/coeff_aggr.rs → ...components/ordering/src/bin/coeff_aggr.rs
diff --git a/mixnet/ordering/src/bin/datamsgcount.rs → ...mponents/ordering/src/bin/datamsgcount.rs b/mixnet/ordering/src/bin/datamsgcount.rs → ...mponents/ordering/src/bin/datamsgcount.rs
diff --git a/mixnet/ordering/src/bin/latency.rs → ...v1/components/ordering/src/bin/latency.rs b/mixnet/ordering/src/bin/latency.rs → ...v1/components/ordering/src/bin/latency.rs
diff --git a/mixnet/ordering/src/iteration.rs → ...t-v1/components/ordering/src/iteration.rs b/mixnet/ordering/src/iteration.rs → ...t-v1/components/ordering/src/iteration.rs
diff --git a/mixnet/ordering/src/lib.rs → .../mixnet-v1/components/ordering/src/lib.rs b/mixnet/ordering/src/lib.rs → .../mixnet-v1/components/ordering/src/lib.rs
diff --git a/mixnet/ordering/src/main.rs → ...mixnet-v1/components/ordering/src/main.rs b/mixnet/ordering/src/main.rs → ...mixnet-v1/components/ordering/src/main.rs
diff --git a/mixnet/ordering/src/message.rs → ...net-v1/components/ordering/src/message.rs b/mixnet/ordering/src/message.rs → ...net-v1/components/ordering/src/message.rs
diff --git a/mixnet/ordering/src/outputs.rs → ...net-v1/components/ordering/src/outputs.rs b/mixnet/ordering/src/outputs.rs → ...net-v1/components/ordering/src/outputs.rs
diff --git a/mixnet/ordering/src/paramset.rs → ...et-v1/components/ordering/src/paramset.rs b/mixnet/ordering/src/paramset.rs → ...et-v1/components/ordering/src/paramset.rs
diff --git a/mixnet/ordering/src/sequence.rs → ...et-v1/components/ordering/src/sequence.rs b/mixnet/ordering/src/sequence.rs → ...et-v1/components/ordering/src/sequence.rs
diff --git a/mixnet/ordering/src/topology.rs → ...et-v1/components/ordering/src/topology.rs b/mixnet/ordering/src/topology.rs → ...et-v1/components/ordering/src/topology.rs
diff --git a/mixnet/protocol/Cargo.toml → .../mixnet-v1/components/protocol/Cargo.toml b/mixnet/protocol/Cargo.toml → .../mixnet-v1/components/protocol/Cargo.toml
diff --git a/mixnet/protocol/src/lib.rs → .../mixnet-v1/components/protocol/src/lib.rs b/mixnet/protocol/src/lib.rs → .../mixnet-v1/components/protocol/src/lib.rs
diff --git a/mixnet/protocol/src/node.rs → ...mixnet-v1/components/protocol/src/node.rs b/mixnet/protocol/src/node.rs → ...mixnet-v1/components/protocol/src/node.rs
diff --git a/mixnet/protocol/src/queue.rs → ...ixnet-v1/components/protocol/src/queue.rs b/mixnet/protocol/src/queue.rs → ...ixnet-v1/components/protocol/src/queue.rs
diff --git a/mixnet/protocol/src/topology.rs → ...et-v1/components/protocol/src/topology.rs b/mixnet/protocol/src/topology.rs → ...et-v1/components/protocol/src/topology.rs
diff --git a/deprecated/mixnet-overall/.gitignore → deprecated/mixnet-v1/fullcycle/.gitignore b/deprecated/mixnet-overall/.gitignore → deprecated/mixnet-v1/fullcycle/.gitignore
diff --git a/deprecated/mixnet-overall/README.md → deprecated/mixnet-v1/fullcycle/README.md b/deprecated/mixnet-overall/README.md → deprecated/mixnet-v1/fullcycle/README.md
@@ -1,4 +1,4 @@
-# NomMix Simulation
+# Mixnet v1 Full Cycle Simulation
 
 * [Project Structure](#project-structure)
 * [Features](#features)

diff --git a/deprecated/mixnet-overall/cmd/__init__.py → ...cated/mixnet-v1/fullcycle/cmd/__init__.py b/deprecated/mixnet-overall/cmd/__init__.py → ...cated/mixnet-v1/fullcycle/cmd/__init__.py
diff --git a/deprecated/mixnet-overall/cmd/hamming.py → ...ecated/mixnet-v1/fullcycle/cmd/hamming.py b/deprecated/mixnet-overall/cmd/hamming.py → ...ecated/mixnet-v1/fullcycle/cmd/hamming.py
diff --git a/deprecated/mixnet-overall/cmd/main.py → deprecated/mixnet-v1/fullcycle/cmd/main.py b/deprecated/mixnet-overall/cmd/main.py → deprecated/mixnet-v1/fullcycle/cmd/main.py
diff --git a/deprecated/mixnet-overall/config.ci.yaml → ...ecated/mixnet-v1/fullcycle/config.ci.yaml b/deprecated/mixnet-overall/config.ci.yaml → ...ecated/mixnet-v1/fullcycle/config.ci.yaml
diff --git a/...ated/mixnet-overall/framework/__init__.py → ...mixnet-v1/fullcycle/framework/__init__.py b/...ated/mixnet-overall/framework/__init__.py → ...mixnet-v1/fullcycle/framework/__init__.py
diff --git a/...cated/mixnet-overall/framework/asyncio.py → .../mixnet-v1/fullcycle/framework/asyncio.py b/...cated/mixnet-overall/framework/asyncio.py → .../mixnet-v1/fullcycle/framework/asyncio.py
diff --git a/...ted/mixnet-overall/framework/framework.py → ...ixnet-v1/fullcycle/framework/framework.py b/...ted/mixnet-overall/framework/framework.py → ...ixnet-v1/fullcycle/framework/framework.py
diff --git a/deprecated/mixnet-overall/framework/usim.py → ...ted/mixnet-v1/fullcycle/framework/usim.py b/deprecated/mixnet-overall/framework/usim.py → ...ted/mixnet-v1/fullcycle/framework/usim.py
diff --git a/...cated/mixnet-overall/protocol/__init__.py → .../mixnet-v1/fullcycle/protocol/__init__.py b/...cated/mixnet-overall/protocol/__init__.py → .../mixnet-v1/fullcycle/protocol/__init__.py
diff --git a/deprecated/mixnet-overall/protocol/config.py → ...ed/mixnet-v1/fullcycle/protocol/config.py b/deprecated/mixnet-overall/protocol/config.py → ...ed/mixnet-v1/fullcycle/protocol/config.py
diff --git a/...ted/mixnet-overall/protocol/connection.py → ...ixnet-v1/fullcycle/protocol/connection.py b/...ted/mixnet-overall/protocol/connection.py → ...ixnet-v1/fullcycle/protocol/connection.py
diff --git a/deprecated/mixnet-overall/protocol/error.py → ...ted/mixnet-v1/fullcycle/protocol/error.py b/deprecated/mixnet-overall/protocol/error.py → ...ted/mixnet-v1/fullcycle/protocol/error.py
diff --git a/deprecated/mixnet-overall/protocol/gossip.py → ...ed/mixnet-v1/fullcycle/protocol/gossip.py b/deprecated/mixnet-overall/protocol/gossip.py → ...ed/mixnet-v1/fullcycle/protocol/gossip.py
diff --git a/deprecated/mixnet-overall/protocol/node.py → ...ated/mixnet-v1/fullcycle/protocol/node.py b/deprecated/mixnet-overall/protocol/node.py → ...ated/mixnet-v1/fullcycle/protocol/node.py
diff --git a/...ecated/mixnet-overall/protocol/nomssip.py → ...d/mixnet-v1/fullcycle/protocol/nomssip.py b/...ecated/mixnet-overall/protocol/nomssip.py → ...d/mixnet-v1/fullcycle/protocol/nomssip.py
diff --git a/deprecated/mixnet-overall/protocol/sphinx.py → ...ed/mixnet-v1/fullcycle/protocol/sphinx.py b/deprecated/mixnet-overall/protocol/sphinx.py → ...ed/mixnet-v1/fullcycle/protocol/sphinx.py
diff --git a/...ed/mixnet-overall/protocol/temporalmix.py → ...xnet-v1/fullcycle/protocol/temporalmix.py b/...ed/mixnet-overall/protocol/temporalmix.py → ...xnet-v1/fullcycle/protocol/temporalmix.py
diff --git a/...ated/mixnet-overall/protocol/test_node.py → ...mixnet-v1/fullcycle/protocol/test_node.py b/...ated/mixnet-overall/protocol/test_node.py → ...mixnet-v1/fullcycle/protocol/test_node.py
diff --git a/...ed/mixnet-overall/protocol/test_sphinx.py → ...xnet-v1/fullcycle/protocol/test_sphinx.py b/...ed/mixnet-overall/protocol/test_sphinx.py → ...xnet-v1/fullcycle/protocol/test_sphinx.py
diff --git a/...xnet-overall/protocol/test_temporalmix.py → ...v1/fullcycle/protocol/test_temporalmix.py b/...xnet-overall/protocol/test_temporalmix.py → ...v1/fullcycle/protocol/test_temporalmix.py
diff --git a/...ted/mixnet-overall/protocol/test_utils.py → ...ixnet-v1/fullcycle/protocol/test_utils.py b/...ted/mixnet-overall/protocol/test_utils.py → ...ixnet-v1/fullcycle/protocol/test_utils.py
diff --git a/deprecated/mixnet-overall/requirements.txt → ...ated/mixnet-v1/fullcycle/requirements.txt b/deprecated/mixnet-overall/requirements.txt → ...ated/mixnet-v1/fullcycle/requirements.txt
diff --git a/deprecated/mixnet-overall/sim/__init__.py → ...cated/mixnet-v1/fullcycle/sim/__init__.py b/deprecated/mixnet-overall/sim/__init__.py → ...cated/mixnet-v1/fullcycle/sim/__init__.py
diff --git a/deprecated/mixnet-overall/sim/config.py → deprecated/mixnet-v1/fullcycle/sim/config.py b/deprecated/mixnet-overall/sim/config.py → deprecated/mixnet-v1/fullcycle/sim/config.py
diff --git a/deprecated/mixnet-overall/sim/connection.py → ...ted/mixnet-v1/fullcycle/sim/connection.py b/deprecated/mixnet-overall/sim/connection.py → ...ted/mixnet-v1/fullcycle/sim/connection.py
diff --git a/deprecated/mixnet-overall/sim/message.py → ...ecated/mixnet-v1/fullcycle/sim/message.py b/deprecated/mixnet-overall/sim/message.py → ...ecated/mixnet-v1/fullcycle/sim/message.py
diff --git a/deprecated/mixnet-overall/sim/simulation.py → ...ted/mixnet-v1/fullcycle/sim/simulation.py b/deprecated/mixnet-overall/sim/simulation.py → ...ted/mixnet-v1/fullcycle/sim/simulation.py
diff --git a/deprecated/mixnet-overall/sim/state.py → deprecated/mixnet-v1/fullcycle/sim/state.py b/deprecated/mixnet-overall/sim/state.py → deprecated/mixnet-v1/fullcycle/sim/state.py
diff --git a/deprecated/mixnet-overall/sim/stats.py → deprecated/mixnet-v1/fullcycle/sim/stats.py b/deprecated/mixnet-overall/sim/stats.py → deprecated/mixnet-v1/fullcycle/sim/stats.py
diff --git a/...ted/mixnet-overall/sim/test_connection.py → ...ixnet-v1/fullcycle/sim/test_connection.py b/...ted/mixnet-overall/sim/test_connection.py → ...ixnet-v1/fullcycle/sim/test_connection.py
diff --git a/...ecated/mixnet-overall/sim/test_message.py → ...d/mixnet-v1/fullcycle/sim/test_message.py b/...ecated/mixnet-overall/sim/test_message.py → ...d/mixnet-v1/fullcycle/sim/test_message.py
diff --git a/...cated/mixnet-overall/sim/test_topology.py → .../mixnet-v1/fullcycle/sim/test_topology.py b/...cated/mixnet-overall/sim/test_topology.py → .../mixnet-v1/fullcycle/sim/test_topology.py
diff --git a/deprecated/mixnet-overall/sim/topology.py → ...cated/mixnet-v1/fullcycle/sim/topology.py b/deprecated/mixnet-overall/sim/topology.py → ...cated/mixnet-v1/fullcycle/sim/topology.py