diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55b921f..79bd484 100644 --- 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 b/deprecated/mixnet-v1/components/.gitignore similarity index 100% rename from mixnet/.gitignore rename to deprecated/mixnet-v1/components/.gitignore diff --git a/mixnet/Cargo.toml b/deprecated/mixnet-v1/components/Cargo.toml similarity index 100% rename from mixnet/Cargo.toml rename to deprecated/mixnet-v1/components/Cargo.toml diff --git a/mixnet/README.md b/deprecated/mixnet-v1/components/README.md similarity index 94% rename from mixnet/README.md rename to deprecated/mixnet-v1/components/README.md index 68c74fb..d8ff9fc 100644 --- a/mixnet/README.md +++ b/deprecated/mixnet-v1/components/README.md @@ -1,4 +1,4 @@ -# Mixnet Simulations +# Mixnet v1 Component Simulations ## Structure diff --git a/mixnet/analysis/.gitignore b/deprecated/mixnet-v1/components/analysis/.gitignore similarity index 100% rename from mixnet/analysis/.gitignore rename to deprecated/mixnet-v1/components/analysis/.gitignore diff --git a/mixnet/analysis/README.md b/deprecated/mixnet-v1/components/analysis/README.md similarity index 100% rename from mixnet/analysis/README.md rename to deprecated/mixnet-v1/components/analysis/README.md diff --git a/mixnet/analysis/coeff.py b/deprecated/mixnet-v1/components/analysis/coeff.py similarity index 100% rename from mixnet/analysis/coeff.py rename to deprecated/mixnet-v1/components/analysis/coeff.py diff --git a/mixnet/analysis/common.py b/deprecated/mixnet-v1/components/analysis/common.py similarity index 100% rename from mixnet/analysis/common.py rename to deprecated/mixnet-v1/components/analysis/common.py diff --git a/mixnet/analysis/latency.py b/deprecated/mixnet-v1/components/analysis/latency.py similarity index 100% rename from mixnet/analysis/latency.py rename to deprecated/mixnet-v1/components/analysis/latency.py diff --git a/mixnet/analysis/requirements.txt b/deprecated/mixnet-v1/components/analysis/requirements.txt similarity index 100% rename from mixnet/analysis/requirements.txt rename to deprecated/mixnet-v1/components/analysis/requirements.txt diff --git a/mixnet/dissemination/Cargo.toml b/deprecated/mixnet-v1/components/dissemination/Cargo.toml similarity index 100% rename from mixnet/dissemination/Cargo.toml rename to deprecated/mixnet-v1/components/dissemination/Cargo.toml diff --git a/mixnet/dissemination/README.md b/deprecated/mixnet-v1/components/dissemination/README.md similarity index 100% rename from mixnet/dissemination/README.md rename to deprecated/mixnet-v1/components/dissemination/README.md diff --git a/mixnet/dissemination/src/iteration.rs b/deprecated/mixnet-v1/components/dissemination/src/iteration.rs similarity index 100% rename from mixnet/dissemination/src/iteration.rs rename to deprecated/mixnet-v1/components/dissemination/src/iteration.rs diff --git a/mixnet/dissemination/src/main.rs b/deprecated/mixnet-v1/components/dissemination/src/main.rs similarity index 100% rename from mixnet/dissemination/src/main.rs rename to deprecated/mixnet-v1/components/dissemination/src/main.rs diff --git a/mixnet/dissemination/src/paramset.rs b/deprecated/mixnet-v1/components/dissemination/src/paramset.rs similarity index 100% rename from mixnet/dissemination/src/paramset.rs rename to deprecated/mixnet-v1/components/dissemination/src/paramset.rs diff --git a/mixnet/ordering/Cargo.toml b/deprecated/mixnet-v1/components/ordering/Cargo.toml similarity index 100% rename from mixnet/ordering/Cargo.toml rename to deprecated/mixnet-v1/components/ordering/Cargo.toml diff --git a/mixnet/ordering/README.md b/deprecated/mixnet-v1/components/ordering/README.md similarity index 100% rename from mixnet/ordering/README.md rename to deprecated/mixnet-v1/components/ordering/README.md diff --git a/mixnet/ordering/src/bin/aggregate.rs b/deprecated/mixnet-v1/components/ordering/src/bin/aggregate.rs similarity index 100% rename from mixnet/ordering/src/bin/aggregate.rs rename to deprecated/mixnet-v1/components/ordering/src/bin/aggregate.rs diff --git a/mixnet/ordering/src/bin/coeff.rs b/deprecated/mixnet-v1/components/ordering/src/bin/coeff.rs similarity index 100% rename from mixnet/ordering/src/bin/coeff.rs rename to deprecated/mixnet-v1/components/ordering/src/bin/coeff.rs diff --git a/mixnet/ordering/src/bin/coeff_aggr.rs b/deprecated/mixnet-v1/components/ordering/src/bin/coeff_aggr.rs similarity index 100% rename from mixnet/ordering/src/bin/coeff_aggr.rs rename to deprecated/mixnet-v1/components/ordering/src/bin/coeff_aggr.rs diff --git a/mixnet/ordering/src/bin/datamsgcount.rs b/deprecated/mixnet-v1/components/ordering/src/bin/datamsgcount.rs similarity index 100% rename from mixnet/ordering/src/bin/datamsgcount.rs rename to deprecated/mixnet-v1/components/ordering/src/bin/datamsgcount.rs diff --git a/mixnet/ordering/src/bin/latency.rs b/deprecated/mixnet-v1/components/ordering/src/bin/latency.rs similarity index 100% rename from mixnet/ordering/src/bin/latency.rs rename to deprecated/mixnet-v1/components/ordering/src/bin/latency.rs diff --git a/mixnet/ordering/src/iteration.rs b/deprecated/mixnet-v1/components/ordering/src/iteration.rs similarity index 100% rename from mixnet/ordering/src/iteration.rs rename to deprecated/mixnet-v1/components/ordering/src/iteration.rs diff --git a/mixnet/ordering/src/lib.rs b/deprecated/mixnet-v1/components/ordering/src/lib.rs similarity index 100% rename from mixnet/ordering/src/lib.rs rename to deprecated/mixnet-v1/components/ordering/src/lib.rs diff --git a/mixnet/ordering/src/main.rs b/deprecated/mixnet-v1/components/ordering/src/main.rs similarity index 100% rename from mixnet/ordering/src/main.rs rename to deprecated/mixnet-v1/components/ordering/src/main.rs diff --git a/mixnet/ordering/src/message.rs b/deprecated/mixnet-v1/components/ordering/src/message.rs similarity index 100% rename from mixnet/ordering/src/message.rs rename to deprecated/mixnet-v1/components/ordering/src/message.rs diff --git a/mixnet/ordering/src/outputs.rs b/deprecated/mixnet-v1/components/ordering/src/outputs.rs similarity index 100% rename from mixnet/ordering/src/outputs.rs rename to deprecated/mixnet-v1/components/ordering/src/outputs.rs diff --git a/mixnet/ordering/src/paramset.rs b/deprecated/mixnet-v1/components/ordering/src/paramset.rs similarity index 100% rename from mixnet/ordering/src/paramset.rs rename to deprecated/mixnet-v1/components/ordering/src/paramset.rs diff --git a/mixnet/ordering/src/sequence.rs b/deprecated/mixnet-v1/components/ordering/src/sequence.rs similarity index 100% rename from mixnet/ordering/src/sequence.rs rename to deprecated/mixnet-v1/components/ordering/src/sequence.rs diff --git a/mixnet/ordering/src/topology.rs b/deprecated/mixnet-v1/components/ordering/src/topology.rs similarity index 100% rename from mixnet/ordering/src/topology.rs rename to deprecated/mixnet-v1/components/ordering/src/topology.rs diff --git a/mixnet/protocol/Cargo.toml b/deprecated/mixnet-v1/components/protocol/Cargo.toml similarity index 100% rename from mixnet/protocol/Cargo.toml rename to deprecated/mixnet-v1/components/protocol/Cargo.toml diff --git a/mixnet/protocol/src/lib.rs b/deprecated/mixnet-v1/components/protocol/src/lib.rs similarity index 100% rename from mixnet/protocol/src/lib.rs rename to deprecated/mixnet-v1/components/protocol/src/lib.rs diff --git a/mixnet/protocol/src/node.rs b/deprecated/mixnet-v1/components/protocol/src/node.rs similarity index 100% rename from mixnet/protocol/src/node.rs rename to deprecated/mixnet-v1/components/protocol/src/node.rs diff --git a/mixnet/protocol/src/queue.rs b/deprecated/mixnet-v1/components/protocol/src/queue.rs similarity index 100% rename from mixnet/protocol/src/queue.rs rename to deprecated/mixnet-v1/components/protocol/src/queue.rs diff --git a/mixnet/protocol/src/topology.rs b/deprecated/mixnet-v1/components/protocol/src/topology.rs similarity index 100% rename from mixnet/protocol/src/topology.rs rename to deprecated/mixnet-v1/components/protocol/src/topology.rs diff --git a/deprecated/mixnet-overall/.gitignore b/deprecated/mixnet-v1/fullcycle/.gitignore similarity index 100% rename from deprecated/mixnet-overall/.gitignore rename to deprecated/mixnet-v1/fullcycle/.gitignore diff --git a/deprecated/mixnet-overall/README.md b/deprecated/mixnet-v1/fullcycle/README.md similarity index 99% rename from deprecated/mixnet-overall/README.md rename to deprecated/mixnet-v1/fullcycle/README.md index bed1aa6..925c006 100644 --- a/deprecated/mixnet-overall/README.md +++ b/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 b/deprecated/mixnet-v1/fullcycle/cmd/__init__.py similarity index 100% rename from deprecated/mixnet-overall/cmd/__init__.py rename to deprecated/mixnet-v1/fullcycle/cmd/__init__.py diff --git a/deprecated/mixnet-overall/cmd/hamming.py b/deprecated/mixnet-v1/fullcycle/cmd/hamming.py similarity index 100% rename from deprecated/mixnet-overall/cmd/hamming.py rename to deprecated/mixnet-v1/fullcycle/cmd/hamming.py diff --git a/deprecated/mixnet-overall/cmd/main.py b/deprecated/mixnet-v1/fullcycle/cmd/main.py similarity index 100% rename from deprecated/mixnet-overall/cmd/main.py rename to deprecated/mixnet-v1/fullcycle/cmd/main.py diff --git a/deprecated/mixnet-overall/config.ci.yaml b/deprecated/mixnet-v1/fullcycle/config.ci.yaml similarity index 100% rename from deprecated/mixnet-overall/config.ci.yaml rename to deprecated/mixnet-v1/fullcycle/config.ci.yaml diff --git a/deprecated/mixnet-overall/framework/__init__.py b/deprecated/mixnet-v1/fullcycle/framework/__init__.py similarity index 100% rename from deprecated/mixnet-overall/framework/__init__.py rename to deprecated/mixnet-v1/fullcycle/framework/__init__.py diff --git a/deprecated/mixnet-overall/framework/asyncio.py b/deprecated/mixnet-v1/fullcycle/framework/asyncio.py similarity index 100% rename from deprecated/mixnet-overall/framework/asyncio.py rename to deprecated/mixnet-v1/fullcycle/framework/asyncio.py diff --git a/deprecated/mixnet-overall/framework/framework.py b/deprecated/mixnet-v1/fullcycle/framework/framework.py similarity index 100% rename from deprecated/mixnet-overall/framework/framework.py rename to deprecated/mixnet-v1/fullcycle/framework/framework.py diff --git a/deprecated/mixnet-overall/framework/usim.py b/deprecated/mixnet-v1/fullcycle/framework/usim.py similarity index 100% rename from deprecated/mixnet-overall/framework/usim.py rename to deprecated/mixnet-v1/fullcycle/framework/usim.py diff --git a/deprecated/mixnet-overall/protocol/__init__.py b/deprecated/mixnet-v1/fullcycle/protocol/__init__.py similarity index 100% rename from deprecated/mixnet-overall/protocol/__init__.py rename to deprecated/mixnet-v1/fullcycle/protocol/__init__.py diff --git a/deprecated/mixnet-overall/protocol/config.py b/deprecated/mixnet-v1/fullcycle/protocol/config.py similarity index 100% rename from deprecated/mixnet-overall/protocol/config.py rename to deprecated/mixnet-v1/fullcycle/protocol/config.py diff --git a/deprecated/mixnet-overall/protocol/connection.py b/deprecated/mixnet-v1/fullcycle/protocol/connection.py similarity index 100% rename from deprecated/mixnet-overall/protocol/connection.py rename to deprecated/mixnet-v1/fullcycle/protocol/connection.py diff --git a/deprecated/mixnet-overall/protocol/error.py b/deprecated/mixnet-v1/fullcycle/protocol/error.py similarity index 100% rename from deprecated/mixnet-overall/protocol/error.py rename to deprecated/mixnet-v1/fullcycle/protocol/error.py diff --git a/deprecated/mixnet-overall/protocol/gossip.py b/deprecated/mixnet-v1/fullcycle/protocol/gossip.py similarity index 100% rename from deprecated/mixnet-overall/protocol/gossip.py rename to deprecated/mixnet-v1/fullcycle/protocol/gossip.py diff --git a/deprecated/mixnet-overall/protocol/node.py b/deprecated/mixnet-v1/fullcycle/protocol/node.py similarity index 100% rename from deprecated/mixnet-overall/protocol/node.py rename to deprecated/mixnet-v1/fullcycle/protocol/node.py diff --git a/deprecated/mixnet-overall/protocol/nomssip.py b/deprecated/mixnet-v1/fullcycle/protocol/nomssip.py similarity index 100% rename from deprecated/mixnet-overall/protocol/nomssip.py rename to deprecated/mixnet-v1/fullcycle/protocol/nomssip.py diff --git a/deprecated/mixnet-overall/protocol/sphinx.py b/deprecated/mixnet-v1/fullcycle/protocol/sphinx.py similarity index 100% rename from deprecated/mixnet-overall/protocol/sphinx.py rename to deprecated/mixnet-v1/fullcycle/protocol/sphinx.py diff --git a/deprecated/mixnet-overall/protocol/temporalmix.py b/deprecated/mixnet-v1/fullcycle/protocol/temporalmix.py similarity index 100% rename from deprecated/mixnet-overall/protocol/temporalmix.py rename to deprecated/mixnet-v1/fullcycle/protocol/temporalmix.py diff --git a/deprecated/mixnet-overall/protocol/test_node.py b/deprecated/mixnet-v1/fullcycle/protocol/test_node.py similarity index 100% rename from deprecated/mixnet-overall/protocol/test_node.py rename to deprecated/mixnet-v1/fullcycle/protocol/test_node.py diff --git a/deprecated/mixnet-overall/protocol/test_sphinx.py b/deprecated/mixnet-v1/fullcycle/protocol/test_sphinx.py similarity index 100% rename from deprecated/mixnet-overall/protocol/test_sphinx.py rename to deprecated/mixnet-v1/fullcycle/protocol/test_sphinx.py diff --git a/deprecated/mixnet-overall/protocol/test_temporalmix.py b/deprecated/mixnet-v1/fullcycle/protocol/test_temporalmix.py similarity index 100% rename from deprecated/mixnet-overall/protocol/test_temporalmix.py rename to deprecated/mixnet-v1/fullcycle/protocol/test_temporalmix.py diff --git a/deprecated/mixnet-overall/protocol/test_utils.py b/deprecated/mixnet-v1/fullcycle/protocol/test_utils.py similarity index 100% rename from deprecated/mixnet-overall/protocol/test_utils.py rename to deprecated/mixnet-v1/fullcycle/protocol/test_utils.py diff --git a/deprecated/mixnet-overall/requirements.txt b/deprecated/mixnet-v1/fullcycle/requirements.txt similarity index 100% rename from deprecated/mixnet-overall/requirements.txt rename to deprecated/mixnet-v1/fullcycle/requirements.txt diff --git a/deprecated/mixnet-overall/sim/__init__.py b/deprecated/mixnet-v1/fullcycle/sim/__init__.py similarity index 100% rename from deprecated/mixnet-overall/sim/__init__.py rename to deprecated/mixnet-v1/fullcycle/sim/__init__.py diff --git a/deprecated/mixnet-overall/sim/config.py b/deprecated/mixnet-v1/fullcycle/sim/config.py similarity index 100% rename from deprecated/mixnet-overall/sim/config.py rename to deprecated/mixnet-v1/fullcycle/sim/config.py diff --git a/deprecated/mixnet-overall/sim/connection.py b/deprecated/mixnet-v1/fullcycle/sim/connection.py similarity index 100% rename from deprecated/mixnet-overall/sim/connection.py rename to deprecated/mixnet-v1/fullcycle/sim/connection.py diff --git a/deprecated/mixnet-overall/sim/message.py b/deprecated/mixnet-v1/fullcycle/sim/message.py similarity index 100% rename from deprecated/mixnet-overall/sim/message.py rename to deprecated/mixnet-v1/fullcycle/sim/message.py diff --git a/deprecated/mixnet-overall/sim/simulation.py b/deprecated/mixnet-v1/fullcycle/sim/simulation.py similarity index 100% rename from deprecated/mixnet-overall/sim/simulation.py rename to deprecated/mixnet-v1/fullcycle/sim/simulation.py diff --git a/deprecated/mixnet-overall/sim/state.py b/deprecated/mixnet-v1/fullcycle/sim/state.py similarity index 100% rename from deprecated/mixnet-overall/sim/state.py rename to deprecated/mixnet-v1/fullcycle/sim/state.py diff --git a/deprecated/mixnet-overall/sim/stats.py b/deprecated/mixnet-v1/fullcycle/sim/stats.py similarity index 100% rename from deprecated/mixnet-overall/sim/stats.py rename to deprecated/mixnet-v1/fullcycle/sim/stats.py diff --git a/deprecated/mixnet-overall/sim/test_connection.py b/deprecated/mixnet-v1/fullcycle/sim/test_connection.py similarity index 100% rename from deprecated/mixnet-overall/sim/test_connection.py rename to deprecated/mixnet-v1/fullcycle/sim/test_connection.py diff --git a/deprecated/mixnet-overall/sim/test_message.py b/deprecated/mixnet-v1/fullcycle/sim/test_message.py similarity index 100% rename from deprecated/mixnet-overall/sim/test_message.py rename to deprecated/mixnet-v1/fullcycle/sim/test_message.py diff --git a/deprecated/mixnet-overall/sim/test_topology.py b/deprecated/mixnet-v1/fullcycle/sim/test_topology.py similarity index 100% rename from deprecated/mixnet-overall/sim/test_topology.py rename to deprecated/mixnet-v1/fullcycle/sim/test_topology.py diff --git a/deprecated/mixnet-overall/sim/topology.py b/deprecated/mixnet-v1/fullcycle/sim/topology.py similarity index 100% rename from deprecated/mixnet-overall/sim/topology.py rename to deprecated/mixnet-v1/fullcycle/sim/topology.py