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

Fixes for Cactus CLI renamings. #777

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Fixes for Cactus CLI renamings. #777

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bca5a91
Fixes for Cactus CLI renamings.
guydavis Sep 21, 2022
de83a25
Merge pull request #776 from guydavis/develop
guydavis Sep 21, 2022
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
15 changes: 12 additions & 3 deletions api/commands/chia_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ def load_blockchain_show(blockchain):

def load_connections_show(blockchain):
chia_binary = globals.get_blockchain_binary(blockchain)
proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
if blockchain == 'cactus': # Cactus now supports only 'peer' command
proc = Popen("{0} peer -c full_node".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
else:
proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
try:
outs, errs = proc.communicate(timeout=30)
if errs:
Expand Down Expand Up @@ -205,7 +208,10 @@ def pause_wallet(blockchain):
def remove_connection(node_id, ip, blockchain):
chia_binary = globals.get_blockchain_binary(blockchain)
try:
proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
if blockchain == 'cactus': # Cactus now supports only 'peer' command
proc = Popen("{0} peer --remove-connection {1} full_node".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
else:
proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
try:
outs, errs = proc.communicate(timeout=30)
if errs:
Expand Down Expand Up @@ -286,7 +292,10 @@ def add_connections(connections, blockchain):
elif socket.gethostbyname(hostname) != hostname:
app.logger.debug('{} is a valid hostname'.format(hostname))
app.logger.info("Adding {0} connection to peer: {1}".format(blockchain, connection))
proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
if blockchain == 'cactus': # Cactus now supports only 'peer' command
proc = Popen("{0} peer --add-connection {1} full_node".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
else:
proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
try:
outs, errs = proc.communicate(timeout=60)
if errs:
Expand Down