Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2800f35
Init CI attempt
maciejzelaszczyk Nov 28, 2022
10cfa19
More
maciejzelaszczyk Nov 28, 2022
f66ea77
Finalization check
maciejzelaszczyk Nov 28, 2022
ca76514
Max node count
maciejzelaszczyk Nov 28, 2022
db687ec
GH action fix
maciejzelaszczyk Nov 28, 2022
05a9e81
Improved error message
maciejzelaszczyk Nov 28, 2022
3a63428
Increased node count
maciejzelaszczyk Nov 28, 2022
3e72f4b
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Nov 28, 2022
e53cd09
Increased timeout for authorities are staking e2e test
maciejzelaszczyk Nov 29, 2022
669f3c6
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Nov 29, 2022
404a3d2
Removed post-test finalization check
maciejzelaszczyk Nov 29, 2022
fce6eeb
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Dec 1, 2022
ba280af
Script fix
maciejzelaszczyk Dec 6, 2022
f7c2999
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Jan 2, 2023
208da43
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Jan 3, 2023
4d4984f
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Jan 10, 2023
fbb2f52
Make sure rotate keys is done for every validator separately
Marcin-Radecki Jan 10, 2023
1fbf0f3
fmt
Marcin-Radecki Jan 10, 2023
ba56d3b
Ip address and ports from config
maciejzelaszczyk Jan 10, 2023
9fc4923
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Jan 11, 2023
6c8cd68
WS params parsing; default node count change
maciejzelaszczyk Jan 11, 2023
2683ce5
Follow up finalization check
maciejzelaszczyk Jan 11, 2023
ba8631e
Patch version bump
maciejzelaszczyk Jan 11, 2023
678ecb1
Extracted controller connections; minor fixes
maciejzelaszczyk Jan 12, 2023
97730f6
Merge branch 'main' into authorities-are-staking-finalization-stall
maciejzelaszczyk Jan 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/run-e2e-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ runs:

RESERVED_SEATS="${{ inputs.reserved-seats }}"
NON_RESERVED_SEATS="${{ inputs.non-reserved-seats }}"

if [[ -n "${RANDOMIZED}" ]]; then
ARGS+=(-r "${RANDOMIZED}")
fi
Expand Down
11 changes: 8 additions & 3 deletions .github/scripts/run_consensus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ set -euo pipefail
# default node count
# change when increasing the number of node containers
NODE_COUNT=5
# max node count that will not crash current GH machines
MAX_NODE_COUNT=6
# default minimum validator count
MIN_VALIDATOR_COUNT=4
DOCKER_COMPOSE=${DOCKER_COMPOSE:-"docker/docker-compose.yml"}
OVERRIDE_DOCKER_COMPOSE=${OVERRIDE_DOCKER_COMPOSE:-""}

# default minimum validator count
MIN_VALIDATOR_COUNT=4

export NODE_IMAGE=aleph-node:latest

mkdir -p docker/data/
Expand Down Expand Up @@ -50,6 +50,11 @@ done

export NODE_COUNT

if [[${NODE_COUNT} -gt ${MAX_NODE_COUNT}]]; then
echo "Tried to run ${NODE_COUNT}. Max node count allowed: ${MAX_NODE_COUNT}."
exit 1
fi

function generate_authorities {
local authorities_count="$1"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-main-devnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ jobs:
node-count: 6
reserved-seats: 3
non-reserved-seats: 3
follow-up-finalization-check: false
follow-up-finalization-check: true
timeout-minutes: 15

run-e2e-ban-automatic:
Expand Down
16 changes: 16 additions & 0 deletions docker/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,19 @@ services:
# key derived from "//4"
- BASE_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW
- NODE_KEY_PATH=/data/5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW/p2p_secret

Node5:
extends:
file: common.yml
service: AlephNonBootNode
container_name: Node5
environment:
- RPC_PORT=9938
- WS_PORT=9948
- PORT=30338
- VALIDATOR_PORT=30348
- PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30348
- NAME=Node5
# key derived from "//5"
- BASE_PATH=/data/5EFb84yH9tpcFuiKUcsmdoF7xeeY3ajG1ZLQimxQoFt9HMKR
- NODE_KEY_PATH=/data/5EFb84yH9tpcFuiKUcsmdoF7xeeY3ajG1ZLQimxQoFt9HMKR/p2p_secret
13 changes: 13 additions & 0 deletions docker/docker-compose.bridged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ services:
- PUBLIC_VALIDATOR_ADDRESS=Node4:30347
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

Node5:
extends:
file: docker-compose.base.yml
service: Node5
networks:
- main
- Node5
environment:
- PUBLIC_VALIDATOR_ADDRESS=Node4:30348
- BOOT_NODES=/dns4/Node0/tcp/30333/p2p/$BOOTNODE_PEER_ID

networks:
main:
name: main-network
Expand All @@ -66,3 +77,5 @@ networks:
name: Node3-network
Node4:
name: Node4-network
Node5:
name: Node5-network
6 changes: 6 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ services:
file: docker-compose.base.yml
service: Node4
network_mode: host

Node5:
extends:
file: docker-compose.base.yml
service: Node5
network_mode: host
1 change: 1 addition & 0 deletions e2e-tests/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions e2e-tests/docker_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ fi

# If test case params are both not empty, run client with them. Otherwise, run without params.
if [[ -n "${RESERVED_SEATS:-}" && -n "${NON_RESERVED_SEATS:-}" ]]; then
VALIDATOR_COUNT = $((${RESERVED_SEATS} + ${NON_RESERVED_SEATS}))
ARGS+=(
--validator-count "${VALIDATOR_COUNT}"
--reserved-seats "${RESERVED_SEATS}"
--non-reserved-seats "${NON_RESERVED_SEATS}"
)
Expand Down