From 0ab337de7bac45ad96d0bdcec3bc40c2dadf5c88 Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Mon, 10 Jun 2024 12:38:56 +0200 Subject: [PATCH 1/5] only running on chain group manager tests --- .github/workflows/ci.yml | 2 +- tests/all_tests_waku.nim | 91 ------------------------------- tests/waku_rln_relay/test_all.nim | 7 +-- 3 files changed, 2 insertions(+), 98 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 770d4824fe..e66667a5aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,7 @@ jobs: postgres_enabled=1 fi - make RLN_V${{matrix.rln_version}}=true V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test testwakunode2 + make RLN_V${{matrix.rln_version}}=true V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test build-docker-image: needs: changes diff --git a/tests/all_tests_waku.nim b/tests/all_tests_waku.nim index f5caf08a19..81e4959561 100644 --- a/tests/all_tests_waku.nim +++ b/tests/all_tests_waku.nim @@ -1,96 +1,5 @@ ## Waku v2 -# Waku core test suite -import - ./waku_core/test_namespaced_topics, - ./waku_core/test_time, - ./waku_core/test_message_digest, - ./waku_core/test_peers, - ./waku_core/test_published_address - -# Waku archive test suite -import - ./waku_archive/test_driver_queue_index, - ./waku_archive/test_driver_queue_pagination, - ./waku_archive/test_driver_queue_query, - ./waku_archive/test_driver_queue, - ./waku_archive/test_driver_sqlite_query, - ./waku_archive/test_driver_sqlite, - ./waku_archive/test_retention_policy, - ./waku_archive/test_waku_archive, - ./waku_archive/test_partition_manager - -const os* {.strdefine.} = "" -when os == "Linux" and - # GitHub only supports container actions on Linux - # and we need to start a postgress database in a docker container - defined(postgres): - import - ./waku_archive/test_driver_postgres_query, - ./waku_archive/test_driver_postgres, - ./factory/test_node_factory, - ./wakunode_rest/test_rest_store - -# Waku store test suite -import - ./waku_store/test_client, - ./waku_store/test_rpc_codec, - ./waku_store/test_waku_store, - ./waku_store/test_wakunode_store - -# Waku legacy store test suite -import - ./waku_store_legacy/test_client, - ./waku_store_legacy/test_rpc_codec, - ./waku_store_legacy/test_waku_store, - ./waku_store_legacy/test_wakunode_store - -when defined(waku_exp_store_resume): - # TODO: Review store resume test cases (#1282) - import ./waku_store_legacy/test_resume - -import - ./node/test_all, - ./waku_filter_v2/test_all, - ./waku_peer_exchange/test_all, - ./waku_lightpush/test_all, - ./waku_relay/test_all, - ./incentivization/test_all - -import - # Waku v2 tests - ./test_wakunode, - ./test_wakunode_lightpush, - ./test_peer_store_extended, - ./test_message_cache, - ./test_peer_manager, - ./test_peer_storage, - ./test_waku_keepalive, - ./test_waku_enr, - ./test_waku_dnsdisc, - ./test_relay_peer_exchange, - ./test_waku_noise, - ./test_waku_noise_sessions, - ./test_waku_netconfig, - ./test_waku_switch, - ./test_waku_rendezvous - -# Waku Keystore test suite -import ./test_waku_keystore_keyfile, ./test_waku_keystore - -## Wakunode Rest API test suite -import - ./wakunode_rest/test_rest_debug, - ./wakunode_rest/test_rest_debug_serdes, - ./wakunode_rest/test_rest_relay, - ./wakunode_rest/test_rest_relay_serdes, - ./wakunode_rest/test_rest_serdes, - ./wakunode_rest/test_rest_filter, - ./wakunode_rest/test_rest_lightpush, - ./wakunode_rest/test_rest_admin, - ./wakunode_rest/test_rest_cors, - ./wakunode_rest/test_rest_health - import ./waku_rln_relay/test_all # Node Factory diff --git a/tests/waku_rln_relay/test_all.nim b/tests/waku_rln_relay/test_all.nim index 7aa3f395ec..3e7075e57e 100644 --- a/tests/waku_rln_relay/test_all.nim +++ b/tests/waku_rln_relay/test_all.nim @@ -1,11 +1,6 @@ {.used.} -import - ./test_rln_group_manager_onchain, - ./test_rln_group_manager_static, - ./test_waku_rln_relay, - ./test_wakunode_rln_relay, - ./test_rln_nonce_manager +import ./test_rln_group_manager_onchain when defined(rln_v2): import ./rln_v2/test_rln_relay_v2_serde From 2b0ccff57a9c4916d15baf1fe1559b181c86351f Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Mon, 10 Jun 2024 12:48:36 +0200 Subject: [PATCH 2/5] start with higher balance --- tests/waku_rln_relay/test_rln_group_manager_onchain.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim index bbebb556c0..c27be19e30 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -149,8 +149,8 @@ proc runAnvil(): Process = let runAnvil = startProcess( anvilPath, args = [ - "--port", "8540", "--gas-limit", "300000000000000", "--balance", "10000", - "--chain-id", "1337", + "--port", "8540", "--gas-limit", "300000000000000", "--balance", + "100000000000000", "--chain-id", "1337", ], options = {poUsePath}, ) From f778ba3608e6502d6d2a4e2da9438dc9e3ca5f0b Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Mon, 10 Jun 2024 13:04:50 +0200 Subject: [PATCH 3/5] Revert "only running on chain group manager tests" This reverts commit 0ab337de7bac45ad96d0bdcec3bc40c2dadf5c88. --- .github/workflows/ci.yml | 2 +- tests/all_tests_waku.nim | 91 +++++++++++++++++++++++++++++++ tests/waku_rln_relay/test_all.nim | 7 ++- 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e66667a5aa..770d4824fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,7 @@ jobs: postgres_enabled=1 fi - make RLN_V${{matrix.rln_version}}=true V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test + make RLN_V${{matrix.rln_version}}=true V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test testwakunode2 build-docker-image: needs: changes diff --git a/tests/all_tests_waku.nim b/tests/all_tests_waku.nim index 81e4959561..f5caf08a19 100644 --- a/tests/all_tests_waku.nim +++ b/tests/all_tests_waku.nim @@ -1,5 +1,96 @@ ## Waku v2 +# Waku core test suite +import + ./waku_core/test_namespaced_topics, + ./waku_core/test_time, + ./waku_core/test_message_digest, + ./waku_core/test_peers, + ./waku_core/test_published_address + +# Waku archive test suite +import + ./waku_archive/test_driver_queue_index, + ./waku_archive/test_driver_queue_pagination, + ./waku_archive/test_driver_queue_query, + ./waku_archive/test_driver_queue, + ./waku_archive/test_driver_sqlite_query, + ./waku_archive/test_driver_sqlite, + ./waku_archive/test_retention_policy, + ./waku_archive/test_waku_archive, + ./waku_archive/test_partition_manager + +const os* {.strdefine.} = "" +when os == "Linux" and + # GitHub only supports container actions on Linux + # and we need to start a postgress database in a docker container + defined(postgres): + import + ./waku_archive/test_driver_postgres_query, + ./waku_archive/test_driver_postgres, + ./factory/test_node_factory, + ./wakunode_rest/test_rest_store + +# Waku store test suite +import + ./waku_store/test_client, + ./waku_store/test_rpc_codec, + ./waku_store/test_waku_store, + ./waku_store/test_wakunode_store + +# Waku legacy store test suite +import + ./waku_store_legacy/test_client, + ./waku_store_legacy/test_rpc_codec, + ./waku_store_legacy/test_waku_store, + ./waku_store_legacy/test_wakunode_store + +when defined(waku_exp_store_resume): + # TODO: Review store resume test cases (#1282) + import ./waku_store_legacy/test_resume + +import + ./node/test_all, + ./waku_filter_v2/test_all, + ./waku_peer_exchange/test_all, + ./waku_lightpush/test_all, + ./waku_relay/test_all, + ./incentivization/test_all + +import + # Waku v2 tests + ./test_wakunode, + ./test_wakunode_lightpush, + ./test_peer_store_extended, + ./test_message_cache, + ./test_peer_manager, + ./test_peer_storage, + ./test_waku_keepalive, + ./test_waku_enr, + ./test_waku_dnsdisc, + ./test_relay_peer_exchange, + ./test_waku_noise, + ./test_waku_noise_sessions, + ./test_waku_netconfig, + ./test_waku_switch, + ./test_waku_rendezvous + +# Waku Keystore test suite +import ./test_waku_keystore_keyfile, ./test_waku_keystore + +## Wakunode Rest API test suite +import + ./wakunode_rest/test_rest_debug, + ./wakunode_rest/test_rest_debug_serdes, + ./wakunode_rest/test_rest_relay, + ./wakunode_rest/test_rest_relay_serdes, + ./wakunode_rest/test_rest_serdes, + ./wakunode_rest/test_rest_filter, + ./wakunode_rest/test_rest_lightpush, + ./wakunode_rest/test_rest_admin, + ./wakunode_rest/test_rest_cors, + ./wakunode_rest/test_rest_health + import ./waku_rln_relay/test_all # Node Factory diff --git a/tests/waku_rln_relay/test_all.nim b/tests/waku_rln_relay/test_all.nim index 3e7075e57e..7aa3f395ec 100644 --- a/tests/waku_rln_relay/test_all.nim +++ b/tests/waku_rln_relay/test_all.nim @@ -1,6 +1,11 @@ {.used.} -import ./test_rln_group_manager_onchain +import + ./test_rln_group_manager_onchain, + ./test_rln_group_manager_static, + ./test_waku_rln_relay, + ./test_wakunode_rln_relay, + ./test_rln_nonce_manager when defined(rln_v2): import ./rln_v2/test_rln_relay_v2_serde From d1cc56de66c10b92fa4983bddd49dfc89e79b0f6 Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Mon, 10 Jun 2024 13:54:38 +0200 Subject: [PATCH 4/5] increasing balance in createEthAccount and using a less exagerated value in runAnvil --- tests/waku_rln_relay/test_rln_group_manager_onchain.nim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim index c27be19e30..e4576f88ef 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -115,14 +115,14 @@ proc createEthAccount(): Future[(keys.PrivateKey, Address)] {.async.} = var tx: EthSend tx.source = accounts[0] - tx.value = some(ethToWei(10.u256)) + tx.value = some(ethToWei(100.u256)) tx.to = some(acc) tx.gasPrice = some(gasPrice) # Send 10 eth to acc discard await web3.send(tx) let balance = await web3.provider.eth_getBalance(acc, "latest") - assert(balance == ethToWei(10.u256)) + assert(balance == ethToWei(100.u256)) return (pk, acc) @@ -149,8 +149,8 @@ proc runAnvil(): Process = let runAnvil = startProcess( anvilPath, args = [ - "--port", "8540", "--gas-limit", "300000000000000", "--balance", - "100000000000000", "--chain-id", "1337", + "--port", "8540", "--gas-limit", "300000000000000", "--balance", "1000000000", + "--chain-id", "1337", ], options = {poUsePath}, ) From 528f2c04edd7f00ab5c110067a9e9e64db0787ab Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Mon, 10 Jun 2024 13:56:36 +0200 Subject: [PATCH 5/5] increasing balance even more --- tests/waku_rln_relay/test_rln_group_manager_onchain.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim index e4576f88ef..a3e412f41d 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -115,14 +115,14 @@ proc createEthAccount(): Future[(keys.PrivateKey, Address)] {.async.} = var tx: EthSend tx.source = accounts[0] - tx.value = some(ethToWei(100.u256)) + tx.value = some(ethToWei(1000.u256)) tx.to = some(acc) tx.gasPrice = some(gasPrice) # Send 10 eth to acc discard await web3.send(tx) let balance = await web3.provider.eth_getBalance(acc, "latest") - assert(balance == ethToWei(100.u256)) + assert(balance == ethToWei(1000.u256)) return (pk, acc)