Skip to content

Commit

Permalink
format fiber code
Browse files Browse the repository at this point in the history
  • Loading branch information
gpBlockchain committed Sep 30, 2024
1 parent 3151c9a commit 00fa12e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 28 deletions.
54 changes: 31 additions & 23 deletions framework/test_fiber.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,9 @@


class FiberConfigPath(Enum):
V100 = (
"/source/template/fiber/config.yml.j2",
"download/fiber/0.1.0/fnn"
)
V100 = ("/source/template/fiber/config.yml.j2", "download/fiber/0.1.0/fnn")

def __init__(
self, fiber_config_path, fiber_bin_path
):
def __init__(self, fiber_config_path, fiber_bin_path):
self.fiber_config_path = fiber_config_path
self.fiber_bin_path = fiber_bin_path

Expand All @@ -30,35 +25,46 @@ class Fiber:

@classmethod
def init_by_port(
cls,
fiber_config_path: FiberConfigPath,
account_private,
tmp_path,
rpc_port,
p2p_port
cls,
fiber_config_path: FiberConfigPath,
account_private,
tmp_path,
rpc_port,
p2p_port,
):
config = {'fiber_listening_addr': f"/ip4/127.0.0.1/tcp/{p2p_port}",
'rpc_listening_addr': f'127.0.0.1:{rpc_port}'}
config = {
"fiber_listening_addr": f"/ip4/127.0.0.1/tcp/{p2p_port}",
"rpc_listening_addr": f"127.0.0.1:{rpc_port}",
}
return Fiber(fiber_config_path, account_private, tmp_path, config)

@classmethod
def init_with_sk(cls):
pass

def __init__(self, fiber_config_path: FiberConfigPath, account_private, tmp_path, sk=None,
config=None):
def __init__(
self,
fiber_config_path: FiberConfigPath,
account_private,
tmp_path,
sk=None,
config=None,
):
if config is None:
config = {'fiber_listening_addr': "/ip4/127.0.0.1/tcp/8228", 'rpc_listening_addr': '127.0.0.1:8227'}
config = {
"fiber_listening_addr": "/ip4/127.0.0.1/tcp/8228",
"rpc_listening_addr": "127.0.0.1:8227",
}
self.fiber_config_enum = fiber_config_path
self.fiber_config = {
"fiber_listening_addr": config['fiber_listening_addr'],
"rpc_listening_addr": config['rpc_listening_addr']
"fiber_listening_addr": config["fiber_listening_addr"],
"rpc_listening_addr": config["rpc_listening_addr"],
}
self.account_private = account_private
self.tmp_path = f"{get_tmp_path()}/{tmp_path}"
self.fiber_config_path = f"{self.tmp_path}/config.yml"
self.client = FiberRPCClient(f"http://{config['rpc_listening_addr']}")
self.rpc_port = config['rpc_listening_addr'].split(":")[-1]
self.rpc_port = config["rpc_listening_addr"].split(":")[-1]
self.sk = sk

def prepare(self, update_config=None):
Expand All @@ -67,9 +73,11 @@ def prepare(self, update_config=None):
self.fiber_config.update(update_config)
# check file exist
create_config_file(
self.fiber_config, self.fiber_config_enum.fiber_config_path, self.fiber_config_path
self.fiber_config,
self.fiber_config_enum.fiber_config_path,
self.fiber_config_path,
)
with open(f"{self.tmp_path}/ckb/key", 'w') as f:
with open(f"{self.tmp_path}/ckb/key", "w") as f:
f.write(self.account_private.replace("0x", ""))
# node
if self.sk is None:
Expand Down
2 changes: 1 addition & 1 deletion framework/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def read_toml_file(file_path):


def generate_random_preimage():
hash_str = '0x'
hash_str = "0x"
for _ in range(64):
hash_str += hex(random.randint(0, 15))[2:]
return hash_str
14 changes: 10 additions & 4 deletions test_cases/fiber/testnet/test_fiber.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ class TestFiber(CkbTest):

def test_01(self):
self.Ckb_cli.util_key_info_by_private_key(self.Config.ACCOUNT_PRIVATE_1)
fiber = Fiber.init_by_port(FiberConfigPath.V100, self.Config.ACCOUNT_PRIVATE_1, "fiber/node", "8228", "8227")
fiber = Fiber.init_by_port(
FiberConfigPath.V100,
self.Config.ACCOUNT_PRIVATE_1,
"fiber/node",
"8228",
"8227",
)

fiber.prepare()
fiber.start()
print("")
fiber.get_client().list_channels({
"peer_id": "QmdyQWjPtbK4NWWsvy8s69NGJaQULwgeQDT5ZpNDrTNaeV"
})
fiber.get_client().list_channels(
{"peer_id": "QmdyQWjPtbK4NWWsvy8s69NGJaQULwgeQDT5ZpNDrTNaeV"}
)
fiber.stop()
fiber.clean()

0 comments on commit 00fa12e

Please sign in to comment.