Skip to content

Commit

Permalink
[Chore] Remove paris2net support
Browse files Browse the repository at this point in the history
  • Loading branch information
krendelhoff2 committed Jul 18, 2024
1 parent 6642939 commit 8990783
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 17 deletions.
1 change: 0 additions & 1 deletion baking/src/tezos_baking/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def pprint_options(self):
networks = {
"mainnet": "Main Tezos network",
"ghostnet": "Long running test network, currently using the Paris Tezos protocol",
"paris2net": "Test network using the PtParisB Tezos protocol",
"pariscnet": "Test network using the PsParisC Tezos protocol",
}

Expand Down
3 changes: 1 addition & 2 deletions baking/src/tezos_baking/tezos_setup_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ def network_name_or_teztnets_url(network):
id="network",
prompt="Which Tezos network would you like to use?\nCurrently supported:",
help="The selected network will be used to set up all required services.\n"
"The currently supported protocol is PtParisB (used on `paris2net`, `ghostnet, and `mainnet`)\n"
"and PsParisC (used on `pariscnet`, is going to be used on `ghostnet`, and `mainnet`).\n"
"The currently supported protocol is PsParisC (used on `pariscnet`, `ghostnet`, and `mainnet`).\n"
"Keep in mind that you must select the test network (e.g. ghostnet)\n"
"if you plan on baking with a faucet JSON file.\n",
options=networks,
Expand Down
2 changes: 0 additions & 2 deletions docker/package/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
networks = {
"mainnet": "mainnet",
"ghostnet": "ghostnet",
"paris2net": "https://teztnets.com/paris2net",
"pariscnet": "https://teztnets.com/pariscnet",
}
networks_protos = {
"mainnet": ["PtParisB", "PsParisC"],
"ghostnet": ["PtParisB", "PsParisC"],
"paris2net": ["PtParisB"],
"pariscnet": ["PsParisC"],
}

Expand Down
2 changes: 1 addition & 1 deletion docs/baking.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ that you can use by following the [installation instructions](https://www.raspbe
In order to run a baking instance, you'll need the following Tezos binaries:
`tezos-client`, `tezos-node`, `tezos-baker-<proto>`.

The currently supported protocol is `ParisB` (used on `paris2net`, `ghostnet` and `mainnet`) and PsParisC (used on `pariscnet`, is going to be used on `ghostnet`, and `mainnet`).
The currently supported protocol is `PsParisC` (used on `pariscnet`, `ghostnet`, and `mainnet`).
Also, note that the corresponding packages have protocol
suffix in lowercase, e.g. the list of available baker packages can be found
[here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published).
Expand Down
3 changes: 1 addition & 2 deletions docs/systemd.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ networks.

`tezos-node` packages provide multiple services out of the box:
- `tezos-node-pariscnet`
- `tezos-node-paris2net`
- `tezos-node-ghostnet`
- `tezos-node-mainnet`

Expand All @@ -78,7 +77,7 @@ Also, there are `tezos-node-<network>` binary aliases that are equivalent to
running `tezos-node` with [the service options](./configuration.md) given.

In addition to node services where the config is predefined to a specific network
(e.g. `tezos-node-mainnet` or `tezos-node-paris2net`), it's possible to run
(e.g. `tezos-node-mainnet` or `tezos-node-pariscnet`), it's possible to run
`tezos-node-custom` service.

Another case for running multiple similar systemd services is when one wants to have
Expand Down
10 changes: 1 addition & 9 deletions tests/systemd/services_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,8 @@ def test_node_mainnet_service():
node_service_test("mainnet")


def test_node_paris2net_service():
node_service_test("paris2net")


def test_baking_paris2net_service():
baking_service_test("paris2net", ["PtParisB"])


def test_baking_mainnet_service():
baking_service_test("mainnet", ["PtParisB"])
baking_service_test("mainnet", ["PsParisC"])


def test_node_pariscnet_service():
Expand Down

0 comments on commit 8990783

Please sign in to comment.