diff --git a/cardano_clusterlib/clusterlib_klass.py b/cardano_clusterlib/clusterlib_klass.py index 71477e9..2ffb964 100644 --- a/cardano_clusterlib/clusterlib_klass.py +++ b/cardano_clusterlib/clusterlib_klass.py @@ -11,12 +11,12 @@ from cardano_clusterlib import address_group from cardano_clusterlib import clusterlib_helpers from cardano_clusterlib import consts -from cardano_clusterlib import conway_gov_group from cardano_clusterlib import exceptions from cardano_clusterlib import genesis_group -from cardano_clusterlib import governance_group +from cardano_clusterlib import gov_group from cardano_clusterlib import helpers from cardano_clusterlib import key_group +from cardano_clusterlib import legacy_gov_group from cardano_clusterlib import node_group from cardano_clusterlib import query_group from cardano_clusterlib import stake_address_group @@ -121,8 +121,8 @@ def __init__( self._node_group: node_group.NodeGroup | None = None self._key_group: key_group.KeyGroup | None = None self._genesis_group: genesis_group.GenesisGroup | None = None - self._governance_group: governance_group.GovernanceGroup | None = None - self._conway_gov_group: conway_gov_group.ConwayGovGroup | None = None + self._legacy_gov_group: legacy_gov_group.LegacyGovGroup | None = None + self._governance_group: gov_group.GovernanceGroup | None = None def set_socket_path(self, socket_path: itp.FileType | None) -> None: """Set a path to socket file for communication with the node.""" @@ -214,24 +214,24 @@ def g_genesis(self) -> genesis_group.GenesisGroup: return self._genesis_group @property - def g_governance(self) -> governance_group.GovernanceGroup: - """Governance group.""" - if not self._governance_group: - self._governance_group = governance_group.GovernanceGroup(clusterlib_obj=self) - return self._governance_group + def g_legacy_governance(self) -> legacy_gov_group.LegacyGovGroup: + """Legacy governance group.""" + if not self._legacy_gov_group: + self._legacy_gov_group = legacy_gov_group.LegacyGovGroup(clusterlib_obj=self) + return self._legacy_gov_group @property - def g_conway_governance(self) -> conway_gov_group.ConwayGovGroup: - """Conway governance group.""" - if self._conway_gov_group: - return self._conway_gov_group + def g_governance(self) -> gov_group.GovernanceGroup: + """Governance group.""" + if self._governance_group: + return self._governance_group if not self.conway_genesis: - msg = "Conway governance group can be used only with Command era >= Conway." + msg = "The governance group can be used only with Command era >= Conway." raise exceptions.CLIError(msg) - self._conway_gov_group = conway_gov_group.ConwayGovGroup(clusterlib_obj=self) - return self._conway_gov_group + self._governance_group = gov_group.GovernanceGroup(clusterlib_obj=self) + return self._governance_group def cli( self, diff --git a/cardano_clusterlib/genesis_group.py b/cardano_clusterlib/genesis_group.py index 29a2151..06a04aa 100644 --- a/cardano_clusterlib/genesis_group.py +++ b/cardano_clusterlib/genesis_group.py @@ -18,7 +18,7 @@ def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._genesis_keys: structs.GenesisKeys | None = None self._genesis_utxo_addr: str = "" - self._cli_args = ("cardano-cli", "legacy", "genesis") + self._cli_args = ("cardano-cli", "latest", "genesis") @property def genesis_keys(self) -> structs.GenesisKeys: diff --git a/cardano_clusterlib/conway_gov_action_group.py b/cardano_clusterlib/gov_action_group.py similarity index 99% rename from cardano_clusterlib/conway_gov_action_group.py rename to cardano_clusterlib/gov_action_group.py index 68570f9..8af29d7 100644 --- a/cardano_clusterlib/conway_gov_action_group.py +++ b/cardano_clusterlib/gov_action_group.py @@ -14,7 +14,7 @@ LOGGER = logging.getLogger(__name__) -class ConwayGovActionGroup: +class GovActionGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._group_args = ("governance", "action") diff --git a/cardano_clusterlib/conway_gov_committee_group.py b/cardano_clusterlib/gov_committee_group.py similarity index 99% rename from cardano_clusterlib/conway_gov_committee_group.py rename to cardano_clusterlib/gov_committee_group.py index 39bb32b..5d3f1d6 100644 --- a/cardano_clusterlib/conway_gov_committee_group.py +++ b/cardano_clusterlib/gov_committee_group.py @@ -11,7 +11,7 @@ LOGGER = logging.getLogger(__name__) -class ConwayGovCommitteeGroup: +class GovCommitteeGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._group_args = ("governance", "committee") diff --git a/cardano_clusterlib/conway_gov_drep_group.py b/cardano_clusterlib/gov_drep_group.py similarity index 99% rename from cardano_clusterlib/conway_gov_drep_group.py rename to cardano_clusterlib/gov_drep_group.py index 0d17107..549f670 100644 --- a/cardano_clusterlib/conway_gov_drep_group.py +++ b/cardano_clusterlib/gov_drep_group.py @@ -12,7 +12,7 @@ LOGGER = logging.getLogger(__name__) -class ConwayGovDrepGroup: +class GovDrepGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._group_args = ("governance", "drep") diff --git a/cardano_clusterlib/conway_gov_group.py b/cardano_clusterlib/gov_group.py similarity index 63% rename from cardano_clusterlib/conway_gov_group.py rename to cardano_clusterlib/gov_group.py index 48ff0c5..a148fb1 100644 --- a/cardano_clusterlib/conway_gov_group.py +++ b/cardano_clusterlib/gov_group.py @@ -2,70 +2,64 @@ import logging -from cardano_clusterlib import conway_gov_action_group -from cardano_clusterlib import conway_gov_committee_group -from cardano_clusterlib import conway_gov_drep_group -from cardano_clusterlib import conway_gov_query_group -from cardano_clusterlib import conway_gov_vote_group +from cardano_clusterlib import gov_action_group +from cardano_clusterlib import gov_committee_group +from cardano_clusterlib import gov_drep_group +from cardano_clusterlib import gov_query_group +from cardano_clusterlib import gov_vote_group from cardano_clusterlib import types as itp LOGGER = logging.getLogger(__name__) -class ConwayGovGroup: +class GovernanceGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj # Groups of commands - self._action_group: conway_gov_action_group.ConwayGovActionGroup | None = None - self._committee_group: conway_gov_committee_group.ConwayGovCommitteeGroup | None = None - self._drep_group: conway_gov_drep_group.ConwayGovDrepGroup | None = None - self._query_group: conway_gov_query_group.ConwayGovQueryGroup | None = None - self._vote_group: conway_gov_vote_group.ConwayGovVoteGroup | None = None + self._action_group: gov_action_group.GovActionGroup | None = None + self._committee_group: gov_committee_group.GovCommitteeGroup | None = None + self._drep_group: gov_drep_group.GovDrepGroup | None = None + self._query_group: gov_query_group.GovQueryGroup | None = None + self._vote_group: gov_vote_group.GovVoteGroup | None = None @property - def action(self) -> conway_gov_action_group.ConwayGovActionGroup: + def action(self) -> gov_action_group.GovActionGroup: """Action group.""" if not self._action_group: - self._action_group = conway_gov_action_group.ConwayGovActionGroup( + self._action_group = gov_action_group.GovActionGroup( clusterlib_obj=self._clusterlib_obj ) return self._action_group @property - def committee(self) -> conway_gov_committee_group.ConwayGovCommitteeGroup: + def committee(self) -> gov_committee_group.GovCommitteeGroup: """Committee group.""" if not self._committee_group: - self._committee_group = conway_gov_committee_group.ConwayGovCommitteeGroup( + self._committee_group = gov_committee_group.GovCommitteeGroup( clusterlib_obj=self._clusterlib_obj ) return self._committee_group @property - def drep(self) -> conway_gov_drep_group.ConwayGovDrepGroup: + def drep(self) -> gov_drep_group.GovDrepGroup: """Drep group.""" if not self._drep_group: - self._drep_group = conway_gov_drep_group.ConwayGovDrepGroup( - clusterlib_obj=self._clusterlib_obj - ) + self._drep_group = gov_drep_group.GovDrepGroup(clusterlib_obj=self._clusterlib_obj) return self._drep_group @property - def query(self) -> conway_gov_query_group.ConwayGovQueryGroup: + def query(self) -> gov_query_group.GovQueryGroup: """Query group.""" if not self._query_group: - self._query_group = conway_gov_query_group.ConwayGovQueryGroup( - clusterlib_obj=self._clusterlib_obj - ) + self._query_group = gov_query_group.GovQueryGroup(clusterlib_obj=self._clusterlib_obj) return self._query_group @property - def vote(self) -> conway_gov_vote_group.ConwayGovVoteGroup: + def vote(self) -> gov_vote_group.GovVoteGroup: """Vote group.""" if not self._vote_group: - self._vote_group = conway_gov_vote_group.ConwayGovVoteGroup( - clusterlib_obj=self._clusterlib_obj - ) + self._vote_group = gov_vote_group.GovVoteGroup(clusterlib_obj=self._clusterlib_obj) return self._vote_group def get_anchor_data_hash( diff --git a/cardano_clusterlib/conway_gov_query_group.py b/cardano_clusterlib/gov_query_group.py similarity index 99% rename from cardano_clusterlib/conway_gov_query_group.py rename to cardano_clusterlib/gov_query_group.py index 1b6ad08..a1e4c20 100644 --- a/cardano_clusterlib/conway_gov_query_group.py +++ b/cardano_clusterlib/gov_query_group.py @@ -9,7 +9,7 @@ LOGGER = logging.getLogger(__name__) -class ConwayGovQueryGroup: +class GovQueryGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._group_args = ("query",) diff --git a/cardano_clusterlib/conway_gov_vote_group.py b/cardano_clusterlib/gov_vote_group.py similarity index 99% rename from cardano_clusterlib/conway_gov_vote_group.py rename to cardano_clusterlib/gov_vote_group.py index e933b35..c613c61 100644 --- a/cardano_clusterlib/conway_gov_vote_group.py +++ b/cardano_clusterlib/gov_vote_group.py @@ -14,7 +14,7 @@ LOGGER = logging.getLogger(__name__) -class ConwayGovVoteGroup: +class GovVoteGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._group_args = ("governance", "vote") diff --git a/cardano_clusterlib/governance_group.py b/cardano_clusterlib/legacy_gov_group.py similarity index 99% rename from cardano_clusterlib/governance_group.py rename to cardano_clusterlib/legacy_gov_group.py index 1be5f4d..f5385f5 100644 --- a/cardano_clusterlib/governance_group.py +++ b/cardano_clusterlib/legacy_gov_group.py @@ -11,7 +11,7 @@ LOGGER = logging.getLogger(__name__) -class GovernanceGroup: +class LegacyGovGroup: def __init__(self, clusterlib_obj: "itp.ClusterLib") -> None: self._clusterlib_obj = clusterlib_obj self._cli_args = ("cardano-cli", "legacy", "governance")