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

Simpler topology #318

Closed
wants to merge 6 commits into from
Closed

Simpler topology #318

wants to merge 6 commits into from

Conversation

deepfire
Copy link
Contributor

@deepfire deepfire commented Nov 20, 2019

  1. Simplify topology file format: s/NetworkTopology/NodeSetup/
  2. Eliminate NetworkTopology and TopologyInfo types.
  3. Update scripts.

TODO

  • Update the Chairman test

@Jimbo4350
Copy link
Contributor

Jimbo4350 commented Nov 20, 2019

Please don't merge this as I've been working on a branch that touches these files.

Update: @deepfire #326 has been merged feel free to proceed.

@deepfire deepfire force-pushed the serge/simpler-topology branch from 49c7b64 to c75fbb1 Compare November 20, 2019 18:13
@deepfire deepfire force-pushed the serge/simpler-topology branch from c75fbb1 to 7966bc1 Compare November 20, 2019 18:31
@deepfire deepfire force-pushed the serge/simpler-topology branch from 7966bc1 to a2c9b2e Compare November 20, 2019 18:57
@deepfire
Copy link
Contributor Author

Heavy conflicts with #320 ..

@Jimbo4350 Jimbo4350 mentioned this pull request Nov 25, 2019
iohk-bors bot added a commit that referenced this pull request Nov 25, 2019
330: Transaction generator: specify target nodes without topology. r=CodiePP a=denisshevchenko

#329

Since #318 is going to eliminate `TopologyInfo` type, tx generator has to avoid such a dependency. Currently tx generator uses `--target-node-id`s only for extracting corresponding IPs/ports from topology file, so now it should receive `--target-node` CLI parameter with not `NodeId`, but with explicit IP/port, for example: `--target-node ("127.0.0.1",3002)`.

Co-authored-by: Denis Shevchenko <[email protected]>
@deepfire deepfire force-pushed the serge/simpler-topology branch from e701a1f to b1c80b5 Compare November 28, 2019 12:02
@deepfire deepfire force-pushed the serge/simpler-topology branch from b1c80b5 to e701a1f Compare December 2, 2019 11:16
@deepfire
Copy link
Contributor Author

deepfire commented Dec 3, 2019

Handing this over to @Jimbo4350, as per agreement.

@@ -0,0 +1,15 @@
{ "nodeAddress":
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this needed? I thought that we agreed that local ip address should (optionally) be provided through cli along with port number?

@Jimbo4350 Jimbo4350 modified the milestones: Sprint 1.1.0, Sprint 1.2.0 Dec 5, 2019
@vhulchenko-iohk vhulchenko-iohk modified the milestones: S3 2020-01-02, S4 2020-01-16 Jan 6, 2020
@Jimbo4350 Jimbo4350 removed this from the S4 2020-01-16 milestone Jan 16, 2020
@deepfire
Copy link
Contributor Author

Dead.

@deepfire deepfire closed this Jan 24, 2020
@Jimbo4350 Jimbo4350 reopened this Jan 27, 2020
@Jimbo4350
Copy link
Contributor

@deepfire this isn't dead its being addressed in #335

iohk-bors bot added a commit that referenced this pull request Feb 3, 2020
335: Implement real vs mock protocol selection r=Jimbo4350 a=Jimbo4350

Implements the `NodeProtocolMode` type which differentiates whether the node is running a real protocol vs a mock protocol.
Changes:
- When running a real protocol, the topology comes from a `JSON` file which is decoded to `RealNodeTopology` which specifies the addresses the node intends to connect to.
- `socket-dir` command line argument is changed to `socket-path` i.e you must specify socket paths and not dirs anymore.
- `NodeId` only needs to be specified for mock protocols (https://github.com/input-output-hk/cardano-node/blob/d24cefd7a4fb1afbf13e8e7f7971e22704673f98/cardano-config/src/Cardano/Config/Protocol.hs#L129)

The `cardano-node` client is now as follows (with further help for both `run` and `run-mock` via `cabal exec cardano-node run/run-mock -- --help`):
```
Usage: cardano-node (run | run-mock) [--help]
  Start node of the Cardano blockchain.

Available options:
  --help                   Show this help text

Execute node with a real protocol.
  run                      Execute node with a real protocol.

Execute node with a mock protocol.
  run-mock                 Execute node with a mock protocol.
```
Relevant: #297, #318, #314

Co-authored-by: Jordan Millar <[email protected]>
@Jimbo4350
Copy link
Contributor

Closing this PR as this issue is being addressed in #335

@Jimbo4350 Jimbo4350 closed this Feb 3, 2020
@dcoutts dcoutts deleted the serge/simpler-topology branch March 25, 2020 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants