Merge pull request #268 from input-output-hk/rm_shelley_protocol

refactor: remove protocol handling from ClusterLib

Author: mkoura

cardano_clusterlib/clusterlib.py

@@ -12,7 +12,6 @@
 from cardano_clusterlib.consts import MAINNET_MAGIC
 from cardano_clusterlib.consts import MultiSigTypeArgs
 from cardano_clusterlib.consts import MultiSlotTypeArgs
-from cardano_clusterlib.consts import Protocols
 from cardano_clusterlib.consts import SLOTS_OFFSETS
 from cardano_clusterlib.consts import ScriptTypes
 from cardano_clusterlib.consts import Votes

cardano_clusterlib/clusterlib_helpers.py

@@ -62,17 +62,6 @@ def _find_conway_genesis_json(clusterlib_obj: "itp.ClusterLib") -> pl.Path:
     return genesis_json
 
 
-def _check_protocol(clusterlib_obj: "itp.ClusterLib") -> None:
-    """Check that the cluster is running with the expected protocol."""
-    try:
-        clusterlib_obj.create_pparams_file()
-    except exceptions.CLIError as exc:
-        if "SingleEraInfo" not in str(exc):
-            raise
-        msg = f"The cluster is running with protocol different from '{clusterlib_obj.protocol}'."
-        raise exceptions.CLIError(msg) from exc
-
-
 def _check_files_exist(*out_files: itp.FileType, clusterlib_obj: "itp.ClusterLib") -> None:
     """Check that the output files don't already exist.
 

cardano_clusterlib/clusterlib_klass.py

@@ -48,7 +48,6 @@ class ClusterLib:
     def __init__(
         self,
         state_dir: itp.FileType,
-        protocol: str = consts.Protocols.CARDANO,
         slots_offset: int = 0,
         socket_path: itp.FileType = "",
         command_era: str = consts.CommandEras.LATEST,
@@ -64,7 +63,6 @@ def __init__(
         self.cli_coverage: dict = {}
         self._rand_str = helpers.get_rand_str(4)
         self._cli_log = ""
-        self.protocol = protocol
         self.era_in_use = (
             consts.Eras.__members__.get(command_era.upper()) or consts.Eras["DEFAULT"]
         ).name.lower()
@@ -129,8 +127,6 @@ def __init__(
         self._governance_group: tp.Optional[governance_group.GovernanceGroup] = None
         self._conway_gov_group: tp.Optional[conway_gov_group.ConwayGovGroup] = None
 
-        clusterlib_helpers._check_protocol(clusterlib_obj=self)
-
     def set_socket_path(self, socket_path: tp.Optional[itp.FileType]) -> None:
         """Set a path to socket file for communication with the node."""
         if not socket_path:
@@ -435,6 +431,4 @@ def time_from_epoch_start(self, tip: tp.Optional[dict] = None) -> float:
         return float(self.epoch_length_sec - s_to_epoch_stop)
 
     def __repr__(self) -> str:
-        return (
-            f"<{self.__class__.__name__}: protocol={self.protocol}, command_era={self.command_era}>"
-        )
+        return f"<{self.__class__.__name__}: command_era={self.command_era}>"

cardano_clusterlib/consts.py

@@ -30,11 +30,6 @@ class CommandEras:
     LATEST: tp.Final[str] = "latest"
 
 
-class Protocols:
-    CARDANO: tp.Final[str] = "cardano"
-    SHELLEY: tp.Final[str] = "shelley"
-
-
 class Eras(enum.Enum):
     BYRON: int = 1
     SHELLEY: int = 2

cardano_clusterlib/query_group.py

@@ -35,7 +35,6 @@ def query_cli(
                 *cli_args,
                 *self._clusterlib_obj.magic_args,
                 *self._clusterlib_obj.socket_args,
-                f"--{self._clusterlib_obj.protocol}-mode",
                 *cli_sub_args,
             ]
         ).stdout

cardano_clusterlib/transaction_group.py

@@ -1133,7 +1133,6 @@ def submit_tx_bare(self, tx_file: itp.FileType) -> None:
                 *self._clusterlib_obj.socket_args,
                 "--tx-file",
                 str(tx_file),
-                f"--{self._clusterlib_obj.protocol}-mode",
             ]
         )