Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify mixnet topology #393

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Simplify mixnet topology #393

merged 2 commits into from
Sep 12, 2023

Conversation

youngjoon-lee
Copy link
Contributor

The mixnet topology doesn't need to hold HashMap<MixnetNodeId, Node>.
Vec<Node> is enough.

With HashMap with the key type MixnetNodeId, it's hard to write config yaml files:

      topology:
        layers:
        - nodes:
            ? - 190
              - 75
              - 117
              - ...
              : address: 127.0.0.1:7777
                public_key: [190, ...]

@youngjoon-lee youngjoon-lee added this to the Mixnet milestone Sep 12, 2023
@youngjoon-lee youngjoon-lee self-assigned this Sep 12, 2023
@codecov
Copy link

codecov bot commented Sep 12, 2023

Codecov Report

Patch coverage is 72.22% of modified lines.

Files Changed Coverage
mixnet/node/src/lib.rs 0.00%
tests/src/nodes/mixnode.rs 0.00%
mixnet/topology/src/lib.rs 100.00%
tests/src/tests/mixnet.rs 100.00%

📢 Thoughts on this report? Let us know!.

Copy link
Contributor

@al8n al8n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@@ -42,6 +42,8 @@ impl MixnetNode {
const CLIENT_NOTI_CHANNEL_SIZE: usize = 100;

pub async fn run(self) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
tracing::info!("Public key: {:?}", self.public_key());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: maybe debug?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to print this as info, so that node operator can get its public key and share it with other operators.

@youngjoon-lee youngjoon-lee merged commit f7b33e4 into mixnet Sep 12, 2023
12 of 13 checks passed
@youngjoon-lee youngjoon-lee deleted the mixnet-topology-conf branch September 12, 2023 11:16
youngjoon-lee added a commit that referenced this pull request Sep 14, 2023
* Add `mixnode` and `mixnet-client` crate (#302)

* Add `mixnode` binary (#317)

* Integrate mixnet with libp2p network backend (#318)

* Fix #312: proper delays (#321)

* proper delays

* add missing duration param

* tiny fix: compilation error caused by `rand` 0.8 -> 0.7

* use `get_available_port()` for mixnet integration tests (#333)

* add missing comments

* Overwatch mixnet node (#339)

* Add mixnet service and overwatch app

* remove #[tokio::main]

---------

Co-authored-by: Youngjoon Lee <[email protected]>

* fix tests for the overwatch mixnode (#342)

* fix panic when corner case happen in RandomDelayIter (#335)

* Use `log` service for `mixnode` bin (#341)

* Use `wire` for MixnetMessage in libp2p (#347)

* Prevent tmixnet tests from running forever (#363)

* Use random delay when sending msgs to mixnet (#362)

* fix a minor compilation error caused by the latest master

* Fix run output fd (#343)

* add a connection pool

* Exp backoff (#332)

* move mixnet listening into separate task

* add exponential retry for insufficient peers in libp2p

* fix logging

* Fix MutexGuard across await (#373)

* Fix MutexGuard across await

Holding a MutexGuard across an await point is not a good idea.
Removing that solves the issues we had with the mixnet test

* Make mixnode handle bodies coming from the same source concurrently (#372)

---------

Co-authored-by: Youngjoon Lee <[email protected]>

* Move wait at network startup (#338)

We now wait after the call to 'subscribe' to give the network
the time to register peers in the mesh before starting to
publish messages

* Remove unused functions from mixnet connpool (#374)

* Mixnet benchmark (#375)

* merge fixes

* add `connection_pool_size` field to `config.yaml`

* Simplify mixnet topology (#393)

* Simplify bytes and duration range ser/de (#394)

* optimize bytes serde and duration serde

---------

Co-authored-by: Al Liu <[email protected]>
Co-authored-by: Daniel Sanchez <[email protected]>
Co-authored-by: Giacomo Pasini <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants