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.

Sign up for GitHub

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

Fix command dep bug #69

Merged
merged 3 commits into from
Jan 7, 2025
Merged

Fix command dep bug #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bf220a
Fix command dep bug
nivcertora Jan 7, 2025
91d2fc4
No need func in command
nivcertora Jan 7, 2025
79b3dd6
Remove redundant imports
nivcertora Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions Quorum/entry_points/quorum_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@

import argparse
from pydantic import BaseModel
from typing import Callable

import Quorum.entry_points.cli_arguments as cli_args
from Quorum.entry_points.implementations.check_proposal import run_single
from Quorum.entry_points.implementations.check_proposal_config import run_config
from Quorum.entry_points.implementations.check_proposal_id import run_proposal_id
from Quorum.entry_points.implementations.create_report import run_create_report
from Quorum.entry_points.implementations.ipfs_validator import run_ipfs_validator
from Quorum.entry_points.implementations.setup_quorum import run_setup_quorum


class Command(BaseModel):
name: str
help: str
arguments: list[cli_args.Argument]
func: Callable[[argparse.Namespace], None]


COMMAND_REGISTRY = [
Expand All @@ -28,23 +20,20 @@ class Command(BaseModel):
cli_args.CUSTOMER_ARGUMENT,
cli_args.CHAIN_ARGUMENT,
cli_args.PROPOSAL_ADDRESS_ARGUMENT
],
func=run_single
]
),
Command(
name="validate-batch",
help="Run a batch check from a JSON config file.",
arguments=[cli_args.CONFIG_ARGUMENT],
func=run_config
arguments=[cli_args.CONFIG_ARGUMENT]
),
Command(
name="validate-by-id",
help="Check proposals by proposal ID.",
arguments=[
cli_args.CUSTOMER_ARGUMENT,
cli_args.PROPOSAL_ID_ARGUMENT
],
func=run_proposal_id
]
),
Command(
name="create-report",
Expand All @@ -53,8 +42,7 @@ class Command(BaseModel):
cli_args.PROPOSAL_ID_ARGUMENT,
cli_args.TEMPLATE_ARGUMENT,
cli_args.GENERATE_REPORT_PATH_ARGUMENT
],
func=run_create_report
]
),
Command(
name="validate-ipfs",
Expand All @@ -64,14 +52,12 @@ class Command(BaseModel):
cli_args.CHAIN_ARGUMENT,
cli_args.PROPOSAL_ADDRESS_ARGUMENT,
cli_args.PROMPT_TEMPLATES_ARGUMENT
],
func=run_ipfs_validator
]
),
Command(
name="setup",
help="Initial Quorum environment setup.",
arguments=[cli_args.WORKING_DIR_ARGUMENT],
func=run_setup_quorum
arguments=[cli_args.WORKING_DIR_ARGUMENT]
)
]

Expand Down Expand Up @@ -105,7 +91,37 @@ def main():
help=subcmd.help
)
add_arguments(subparser, subcmd.arguments)
subparser.set_defaults(func=subcmd.func)

if subcmd.name == "validate-address":
def run(args):
from Quorum.entry_points.implementations.check_proposal import run_single
run_single(args)
subparser.set_defaults(func=run)
elif subcmd.name == "validate-batch":
def run(args):
from Quorum.entry_points.implementations.check_proposal_config import run_config
run_config(args)
subparser.set_defaults(func=run)
elif subcmd.name == "validate-by-id":
def run(args):
from Quorum.entry_points.implementations.check_proposal_id import run_proposal_id
run_proposal_id(args)
subparser.set_defaults(func=run)
elif subcmd.name == "create-report":
def run(args):
from Quorum.entry_points.implementations.create_report import run_create_report
run_create_report(args)
subparser.set_defaults(func=run)
elif subcmd.name == "validate-ipfs":
def run(args):
from Quorum.entry_points.implementations.ipfs_validator import run_ipfs_validator
run_ipfs_validator(args)
subparser.set_defaults(func=run)
elif subcmd.name == "setup":
def run(args):
from Quorum.entry_points.implementations.setup_quorum import run_setup_quorum
run_setup_quorum(args)
subparser.set_defaults(func=run)

args = parser.parse_args()

Expand Down
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20250107.151758.528252
20250107.201507.181876
Loading