fix test scripts

ChainSafe · Jan 7, 2025 · 2004a19 · 2004a19
1 parent cdd00fa
commit 2004a19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/scripts/tests/calibnet_no_discovery_check.sh b/scripts/tests/calibnet_no_discovery_check.sh
@@ -5,7 +5,8 @@ set -euxo pipefail
 
 source "$(dirname "$0")/harness.sh"
 
-$FOREST_PATH --chain calibnet --encrypt-keystore false --mdns false --kademlia false --auto-download-snapshot --log-dir "$LOG_DIRECTORY" --detach --save-token ./admin_token
+$FOREST_PATH --chain calibnet --encrypt-keystore false --mdns false --kademlia false --auto-download-snapshot --log-dir "$LOG_DIRECTORY" --save-token ./admin_token &
+FOREST_NODE_PID=$!
 FULLNODE_API_INFO="$(cat admin_token):/ip4/127.0.0.1/tcp/2345/http"
 export FULLNODE_API_INFO
 
@@ -18,3 +19,4 @@ done
 until [[ $($FOREST_CLI_PATH f3 certs get --output json | jq '.GPBFTInstance') -gt 100 ]]; do
     sleep 1s;
 done
+kill -KILL $FOREST_NODE_PID
diff --git a/scripts/tests/calibnet_other_check.sh b/scripts/tests/calibnet_other_check.sh
@@ -40,8 +40,3 @@ echo "Test subcommand: net info"
 $FOREST_CLI_PATH net info
 
 $FOREST_CLI_PATH sync wait # allow the node to re-sync
-
-# Verify F3 is getting certificates from the network
-until [[ $($FOREST_CLI_PATH f3 certs get --output json | jq '.GPBFTInstance') -gt 100 ]]; do
-    sleep 1s;
-done
diff --git a/src/f3/mod.rs b/src/f3/mod.rs
@@ -100,6 +100,7 @@ pub fn run_f3_sidecar_if_enabled(
     if is_sidecar_ffi_enabled(chain_config) {
         #[cfg(all(f3sidecar, not(feature = "no-f3-sidecar")))]
         {
+            tracing::info!("Starting F3 sidecar service ...");
             GoF3NodeImpl::run(
                 _rpc_endpoint,
                 _jwt,