Skip to content

Commit 0345df3

Browse files
committed
Moving casper-node-util for packaging and some cleanup.
1 parent 39bc743 commit 0345df3

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class NodeUtil:
4040
BIN_PATH = Path("/var/lib/casper/bin")
4141
DB_PATH = Path("/var/lib/casper/casper-node")
4242
NET_CONFIG_PATH = CONFIG_PATH / "network_configs"
43-
PLATFORM_PATH = CONFIG_PATH / "PLATFORM"
44-
SCRIPT_NAME = "casper-casper-node-util"
43+
SCRIPT_NAME = "casper-node-util"
4544
NODE_IP = "127.0.0.1"
4645
VERSION = "1.0.7"
4746

@@ -96,14 +95,6 @@ class NodeUtil:
9695
params = [{"Height": int(block_height)}]
9796
return NodeUtil._rpc_call("chain_get_block", server, params, port)
9897

99-
@staticmethod
100-
def _get_platform():
101-
""" Support old default debian and then newer platforms with PLATFORM files """
102-
if NodeUtil.PLATFORM_PATH.exists():
103-
return NodeUtil.PLATFORM_PATH.read_text().strip()
104-
else:
105-
return "deb"
106-
10798
def _load_config_values(self, config):
10899
"""
109100
Parses config file to get values
@@ -207,7 +198,7 @@ class NodeUtil:
207198
def _network_url(self):
208199
return f"http://{self._url}/{self._network_name}"
209200

210-
def _pull_protocol_version(self, protocol_version, platform="deb"):
201+
def _pull_protocol_version(self, protocol_version):
211202
self._verify_casper_user()
212203

213204
if not NodeUtil.BIN_PATH.exists():
@@ -427,7 +418,6 @@ class NodeUtil:
427418
self._load_config_values(args.config)
428419

429420
self._verify_casper_user()
430-
platform = self._get_platform()
431421
exit_code = 0
432422
for pv in self._get_protocols():
433423
status = self._check_staged_version(pv)
@@ -440,7 +430,7 @@ class NodeUtil:
440430
continue
441431
if status == Status.UNSTAGED:
442432
print(f"Pulling protocol for {pv}.")
443-
if not self._pull_protocol_version(pv, platform):
433+
if not self._pull_protocol_version(pv):
444434
exit_code = 1
445435
if status in (Status.UNSTAGED, Status.NO_CONFIG):
446436
print(f"Creating config for {pv}.")

0 commit comments

Comments
 (0)