Reorder sanity.

1. Check for presence of nodes
2. Check for functioning RPC API
3. Then try the wallet

ci/localnet-sanity.sh

@@ -62,12 +62,6 @@ flag_error() {
   exit 1
 }
 
-echo "--- Wallet sanity"
-(
-  set -x
-  timeout 60s scripts/wallet-sanity.sh
-) || flag_error
-
 echo "--- Node count"
 (
   source multinode-demo/common.sh
@@ -91,6 +85,12 @@ echo "--- RPC API: getTransactionCount"
     http://localhost:8899
 ) || flag_error
 
+echo "--- Wallet sanity"
+(
+  set -x
+  timeout 60s scripts/wallet-sanity.sh
+) || flag_error
+
 killBackgroundCommands
 
 echo "--- Ledger verification"

net/remote/remote-sanity.sh

@@ -89,22 +89,6 @@ local|tar)
   exit 1
 esac
 
-
-echo "--- RPC API: getTransactionCount"
-(
-  set -x
-  curl --retry 5 --retry-delay 2 --retry-connrefused \
-    -X POST -H 'Content-Type: application/json' \
-    -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' \
-    http://"$entrypointIp":8899
-)
-
-echo "--- $entrypointIp: wallet sanity"
-(
-  set -x
-  scripts/wallet-sanity.sh "$entrypointIp":8001
-)
-
 echo "+++ $entrypointIp: node count ($numNodes expected)"
 (
   set -x
@@ -124,6 +108,21 @@ echo "+++ $entrypointIp: node count ($numNodes expected)"
     --converge-only
 )
 
+echo "--- RPC API: getTransactionCount"
+(
+  set -x
+  curl --retry 5 --retry-delay 2 --retry-connrefused \
+    -X POST -H 'Content-Type: application/json' \
+    -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' \
+    http://"$entrypointIp":8899
+)
+
+echo "--- $entrypointIp: wallet sanity"
+(
+  set -x
+  scripts/wallet-sanity.sh "$entrypointIp":8001
+)
+
 echo "--- $entrypointIp: verify ledger"
 if $ledgerVerify; then
   if [[ -d $ledger ]]; then