Skip to content

Commit 0b53318

Browse files
committed
update nix source dep, remove lambda, and nit
1 parent be039be commit 0b53318

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

integration_tests/ibc_utils.py

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -456,14 +456,19 @@ def assert_trace_balance(addr):
456456
else:
457457
return False
458458

459-
denom_trace = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
460-
print("denom_trace", denom_trace)
459+
denom = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
461460

462-
assert denom_trace["base"] == denom0
463-
assert denom_trace["trace"] == [{"port_id": "transfer", "channel_id": channel1}]
461+
assert denom["base"] == denom0
462+
assert denom["trace"] == [{"port_id": "transfer", "channel_id": channel1}]
464463

465464
for i, _ in enumerate(users):
466-
wait_for_fn("assert balance", lambda: assert_trace_balance(addrs1[i]))
465+
print(f"user{i+1} -> {addrs1[i]}")
466+
addr = addrs1[i]
467+
468+
def check_balance(addr=addr):
469+
return assert_trace_balance(addr)
470+
471+
wait_for_fn("assert balance", check_balance)
467472

468473
# chainmain-1 -> cronos_777-1
469474
amt = amount // 2
@@ -488,7 +493,13 @@ def assert_balance(addr):
488493
assert rsp["code"] == 0, rsp["raw_log"]
489494

490495
for i, _ in enumerate(users):
491-
wait_for_fn("assert balance", lambda: assert_balance(addrs0[i]))
496+
print(f"user{i+1} -> {addrs0[i]}")
497+
addr = addrs0[i]
498+
499+
def check_balance(addr=addr):
500+
return assert_balance(addr)
501+
502+
wait_for_fn("assert balance", check_balance)
492503

493504
old_balance0 += amt
494505

@@ -565,8 +576,9 @@ def check_fee():
565576
assert user0_balances == expected, user0_balances
566577
path = f"transfer/{dst_channel}/{base_denom0}"
567578
denom_hash = ibc_denom(dst_channel, base_denom0)
568-
denom_trace = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
569-
assert denom_trace == {"path": f"transfer/{dst_channel}", "base_denom": base_denom0}
579+
denom = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
580+
assert denom["base"] == base_denom0
581+
assert denom["trace"] == [{"port_id": "transfer", "channel_id": dst_channel}]
570582
user1_balances = get_balances(ibc.chainmain, user1)
571583
expected = [
572584
{"denom": base_denom1, "amount": f"{old_user1_base}"},

nix/sources.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"chain-main": {
3-
"branch": "jt/ibc-go-v10",
3+
"branch": "release/v7",
44
"description": "Crypto.org Chain⛓: Croeseid Testnet and beyond development",
55
"homepage": "https://crypto.org",
6-
"owner": "JayT106",
6+
"owner": "crypto-org-chain",
77
"repo": "chain-main",
8-
"rev": "293428e4d63c0fd10ffda4c07636b0f1401d648b",
9-
"sha256": "0zrdjgvgh02281894ap9msc0rmlz3v4sxpqx55hjskyyahm6hf8d",
8+
"rev": "d3ef39afd014cc39a57ac5391b5ac27cc3e9370e",
9+
"sha256": "1vg6v1vs01n4pwnzda8ycn05c8k9k6hwwklibw9q3rad54kk7jm3",
1010
"type": "tarball",
11-
"url": "https://github.com/JayT106/chain-main/archive/refs/tags/ibc-go-v10/chain-main_devel_Darwin_arm64.tar.gz",
12-
"url_template": "https://github.com/JayT106/chain-main/archive/refs/tags/ibc-go-v10/chain-main_devel_Darwin_arm64.tar.gz"
11+
"url": "https://github.com/crypto-org-chain/chain-main/archive/d3ef39afd014cc39a57ac5391b5ac27cc3e9370e.tar.gz",
12+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"dapptools": {
1515
"branch": "master",

0 commit comments

Comments
 (0)