From 89907830e69f91edffeb5ca5099d80d6cc286d62 Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Wed, 17 Jul 2024 18:00:15 +0530 Subject: [PATCH] [Chore] Remove paris2net support --- baking/src/tezos_baking/steps.py | 1 - baking/src/tezos_baking/tezos_setup_wizard.py | 3 +-- docker/package/packages.py | 2 -- docs/baking.md | 2 +- docs/systemd.md | 3 +-- tests/systemd/services_tests.py | 10 +--------- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py index de4525ce2..f2565dcfa 100644 --- a/baking/src/tezos_baking/steps.py +++ b/baking/src/tezos_baking/steps.py @@ -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", } diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index b696b196b..dbb3e8375 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -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, diff --git a/docker/package/packages.py b/docker/package/packages.py index 0177c5295..1053531c3 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -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"], } diff --git a/docs/baking.md b/docs/baking.md index 2d534fa51..69f204b08 100644 --- a/docs/baking.md +++ b/docs/baking.md @@ -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-`. -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). diff --git a/docs/systemd.md b/docs/systemd.md index f073c4fad..3722f75f7 100644 --- a/docs/systemd.md +++ b/docs/systemd.md @@ -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` @@ -78,7 +77,7 @@ Also, there are `tezos-node-` 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 diff --git a/tests/systemd/services_tests.py b/tests/systemd/services_tests.py index 20ef62b52..2084766c0 100644 --- a/tests/systemd/services_tests.py +++ b/tests/systemd/services_tests.py @@ -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():