From 2b509a632482b7f653157b97cd78c6aa4a71472d Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 14 Dec 2021 13:08:53 +0300 Subject: [PATCH] decrease startup sleep to 5s for relays and to 120s for generators + remove curl --- .../entrypoints/relay-messages-millau-to-rialto-entrypoint.sh | 4 +--- .../entrypoints/relay-messages-rialto-to-millau-entrypoint.sh | 4 +--- .../relay-messages-to-millau-generator-entrypoint.sh | 2 +- .../relay-messages-to-rialto-generator-entrypoint.sh | 2 +- .../relay-messages-to-rialto-resubmitter-entrypoint.sh | 3 +-- .../entrypoints/relay-millau-rialto-entrypoint.sh | 4 +--- .../entrypoints/relay-token-swap-generator-entrypoint.sh | 2 +- .../entrypoints/relay-headers-westend-to-millau-entrypoint.sh | 4 +--- .../entrypoints/rialto-parachain-registrar-entrypoint.sh | 4 +--- 9 files changed, 9 insertions(+), 20 deletions(-) diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-messages-millau-to-rialto-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-messages-millau-to-rialto-entrypoint.sh index 758dce2515..743cc47f07 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-messages-millau-to-rialto-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-messages-millau-to-rialto-entrypoint.sh @@ -1,9 +1,7 @@ #!/bin/bash set -xeu -sleep 60 -curl -v http://millau-node-bob:9933/health -curl -v http://rialto-node-bob:9933/health +sleep 15 MESSAGE_LANE=${MSG_EXCHANGE_GEN_LANE:-00000000} diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-messages-rialto-to-millau-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-messages-rialto-to-millau-entrypoint.sh index e0731e9058..2b536dbd81 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-messages-rialto-to-millau-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-messages-rialto-to-millau-entrypoint.sh @@ -1,9 +1,7 @@ #!/bin/bash set -xeu -sleep 60 -curl -v http://millau-node-bob:9933/health -curl -v http://rialto-node-bob:9933/health +sleep 15 MESSAGE_LANE=${MSG_EXCHANGE_GEN_LANE:-00000000} diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-millau-generator-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-millau-generator-entrypoint.sh index b8d051a131..9cae01fc0c 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-millau-generator-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-millau-generator-entrypoint.sh @@ -36,7 +36,7 @@ BUNCH_OF_MESSAGES_TIME=3600 # give conversion rate updater some time to update Millau->Rialto conversion rate in Rialto # (initially rate=1 and rational relayer won't deliver any messages if it'll be changed to larger value) -sleep 180 +sleep 120 while true do diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-generator-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-generator-entrypoint.sh index 0365ebe1d8..ed733411f3 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-generator-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-generator-entrypoint.sh @@ -36,7 +36,7 @@ BUNCH_OF_MESSAGES_TIME=3600 # give conversion rate updater some time to update Rialto->Millau conversion rate in Millau # (initially rate=1 and rational relayer won't deliver any messages if it'll be changed to larger value) -sleep 180 +sleep 120 while true do diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh index ca4c9f03a8..068560e150 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh @@ -1,8 +1,7 @@ #!/bin/bash set -xeu -sleep 20 -curl -v http://millau-node-alice:9933/health +sleep 15 # //Dave is signing Millau -> Rialto message-send transactions, which are causing problems. # diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-millau-rialto-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-millau-rialto-entrypoint.sh index f7ee812fa5..bab0e1c4af 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-millau-rialto-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-millau-rialto-entrypoint.sh @@ -1,9 +1,7 @@ #!/bin/bash set -xeu -sleep 60 -curl -v http://millau-node-alice:9933/health -curl -v http://rialto-node-alice:9933/health +sleep 15 /home/user/substrate-relay init-bridge millau-to-rialto \ --source-host millau-node-alice \ diff --git a/deployments/bridges/rialto-millau/entrypoints/relay-token-swap-generator-entrypoint.sh b/deployments/bridges/rialto-millau/entrypoints/relay-token-swap-generator-entrypoint.sh index 95bbe1e38f..b773d61595 100755 --- a/deployments/bridges/rialto-millau/entrypoints/relay-token-swap-generator-entrypoint.sh +++ b/deployments/bridges/rialto-millau/entrypoints/relay-token-swap-generator-entrypoint.sh @@ -25,7 +25,7 @@ rand_sleep() { # give conversion rate updater some time to update Rialto->Millau conversion rate in Millau # (initially rate=1 and rational relayer won't deliver any messages if it'll be changed to larger value) -sleep 180 +sleep 120 while true do diff --git a/deployments/bridges/westend-millau/entrypoints/relay-headers-westend-to-millau-entrypoint.sh b/deployments/bridges/westend-millau/entrypoints/relay-headers-westend-to-millau-entrypoint.sh index d3b6932983..f37ee69915 100755 --- a/deployments/bridges/westend-millau/entrypoints/relay-headers-westend-to-millau-entrypoint.sh +++ b/deployments/bridges/westend-millau/entrypoints/relay-headers-westend-to-millau-entrypoint.sh @@ -1,9 +1,7 @@ #!/bin/bash set -xeu -sleep 60 -curl -v http://millau-node-alice:9933/health -curl -v https://westend-rpc.polkadot.io:443/health +sleep 15 /home/user/substrate-relay init-bridge westend-to-millau \ --source-host westend-rpc.polkadot.io \ diff --git a/deployments/networks/entrypoints/rialto-parachain-registrar-entrypoint.sh b/deployments/networks/entrypoints/rialto-parachain-registrar-entrypoint.sh index 172502327c..519ab228e9 100755 --- a/deployments/networks/entrypoints/rialto-parachain-registrar-entrypoint.sh +++ b/deployments/networks/entrypoints/rialto-parachain-registrar-entrypoint.sh @@ -1,9 +1,7 @@ #!/bin/bash set -xeu -sleep 60 -curl -v http://rialto-node-alice:9933/health -curl -v http://rialto-parachain-collator-alice:9933/health +sleep 15 /home/user/substrate-relay register-parachain rialto-parachain \ --parachain-host rialto-parachain-collator-alice \