Merge remote-tracking branch 'origin/hotstuff_integration' into GH-2057…

…-transition
AntelopeIO · Mar 21, 2024 · 35839ed · 35839ed
2 parents 26d82da + b624c24
commit 35839ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tests/p2p_sync_throttle_test.py b/tests/p2p_sync_throttle_test.py
@@ -136,6 +136,7 @@ def extractPrometheusMetric(connID: str, metric: str, text: str):
             if len(response) < 100:
                 # tolerate HTTPError as well (method returns only the exception code)
                 errorLimit -= 1
+                time.sleep(0.5)
                 continue
             connPorts = prometheusHostPortPattern.findall(response)
             Print(connPorts)
@@ -180,6 +181,7 @@ def extractPrometheusMetric(connID: str, metric: str, text: str):
             if len(connPorts) < 2:
                 # wait for sending node to be connected
                 errorLimit -= 1
+                time.sleep(0.5)
                 continue
             Print('Throttled Node Start State')
             throttledNodePortMap = {port: id for id, port in connPorts if port != '0'}

diff --git a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
@@ -357,7 +357,8 @@ def stepSetSystemContract():
     # THIS DEPENDS ON DISABLE_DEFERRED_TRXS_STAGE_1 
     retry(args.cleos + 'push action eosio activate \'["09e86cb0accf8d81c9e85d34bea4b925ae936626d00c984e4691186891f5bc16"]\' -p eosio@active')
     # INSTANT_FINALITY
-    retry(args.cleos + 'push action eosio activate \'["8cb6dd1e5607208331eb5983141e159c75a597413887e80e8a9a4b715a507eb7"]\' -p eosio@active')
+    # Depends on WTMSIG_BLOCK_SIGNATURES , BLS_PRIMITIVES2 , DISALLOW_EMPTY_PRODUCER_SCHEDULE , ACTION_RETURN_VALUE
+    retry(args.cleos + 'push action eosio activate \'["18b790108f5e277cf7141dc626a98f7edeb776912278e4cd14a50b763d1d6390"]\' -p eosio@active')
     sleep(1)
 
     # install eosio.system latest version