Switch to manual peering in docker-network to speed up tests

iotaledger · May 16, 2024 · 23490ef · 23490ef
1 parent 59d4abf
commit 23490ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/tools/docker-network/.env b/tools/docker-network/.env
@@ -8,12 +8,7 @@ COMMON_CONFIG="
 --profiling.bindAddress=0.0.0.0:6061
 --restAPI.publicRoutes=/health,/api/routes,/api/core/v3/info,/api/core/v3/network*,/api/core/v3/blocks*,/api/core/v3/transactions*,/api/core/v3/commitments*,/api/core/v3/outputs*,/api/core/v3/accounts*,/api/core/v3/validators*,/api/core/v3/rewards*,/api/core/v3/committee*,/api/debug/v2/*,/api/indexer/v2/*,/api/mqtt/v2,/api/blockissuer/v1/*,/api/management/v1/*
 --debugAPI.enabled=false
---p2p.autopeering.maxPeers=5
---p2p.autopeering.allowLocalIPs=true
-"
-
-AUTOPEERING_CONFIG="
---p2p.autopeering.bootstrapPeers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK
+--p2p.autopeering.maxPeers=0
 "
 
 # admin/admin

diff --git a/tools/docker-network/docker-compose.yml b/tools/docker-network/docker-compose.yml
@@ -30,6 +30,8 @@ services:
       --db.path==${DB_PATH_V1:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_V1:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=08735375679f3d8031353e94282ed1d65119e5c288fe56d6639d9184a3f978fee8febfedff11cc376daea0f59c395ae2e9a870a25ac4e36093000fbf4d0e8f18
+      --p2p.peers=/dns/node-2-validator/tcp/15600/p2p/12D3KooWCropDmzpoLy8UrFg59M1oUx7k1UmQmuHrmN5RDgp6pVL,/dns/node-3-validator/tcp/15600/p2p/12D3KooWPr1mW33PGhv3oRbPQQDesN4THBB3WgnYsNzCfnQLr5QR,/dns/node-4-validator/tcp/15600/p2p/12D3KooWRxDSg2H7ThEJyn4HNkL1ixsqm6PgjCtkTG1hm7NpYG4Q,/dns/node-5/tcp/15600/p2p/12D3KooWG9S868XrL1wzeUbMXDtBTAaxwuqktAzUodFFES8uoTGz,/dns/node-6/tcp/15600/p2p/12D3KooWFatFVM1wyGnMUwJrMW7YwD6j32iq5SCA9S7e386biZ73
+      --p2p.peerAliases=node-2-validator,node-3-validator,node-4-validator,node-5,node-6
       --node.alias=node-1-validator
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029
@@ -62,10 +64,11 @@ services:
       - ./config.json:/app/config.json:ro
     command: >
       ${COMMON_CONFIG}
-      ${AUTOPEERING_CONFIG}
       --db.path==${DB_PATH_V2:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_V2:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=ba771419c52132a0dfb2521ed18667813f398da159010a55a0a482af939affb92d3338789ad4a07a7631b91791deb11f82ed5dc612822f24275e9f7a313b691f
+      --p2p.peers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK,/dns/node-3-validator/tcp/15600/p2p/12D3KooWPr1mW33PGhv3oRbPQQDesN4THBB3WgnYsNzCfnQLr5QR,/dns/node-4-validator/tcp/15600/p2p/12D3KooWRxDSg2H7ThEJyn4HNkL1ixsqm6PgjCtkTG1hm7NpYG4Q,/dns/node-5/tcp/15600/p2p/12D3KooWG9S868XrL1wzeUbMXDtBTAaxwuqktAzUodFFES8uoTGz,/dns/node-6/tcp/15600/p2p/12D3KooWFatFVM1wyGnMUwJrMW7YwD6j32iq5SCA9S7e386biZ73
+      --p2p.peerAliases=node-1-validator,node-3-validator,node-4-validator,node-5,node-6
       --node.alias=node-2-validator
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029
@@ -96,10 +99,11 @@ services:
       - ./config.json:/app/config.json:ro
     command: >
       ${COMMON_CONFIG}
-      ${AUTOPEERING_CONFIG}
       --db.path==${DB_PATH_V3:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_V3:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=a6261ac049755675ff1437654ca9f83b305055f01ff08c4f039209ef5a4a7d96d06fb61df77a8815209a8f4d204226dee593e50d0ec897ec440a2c1fbde77656
+      --p2p.peers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK,/dns/node-2-validator/tcp/15600/p2p/12D3KooWCropDmzpoLy8UrFg59M1oUx7k1UmQmuHrmN5RDgp6pVL,/dns/node-4-validator/tcp/15600/p2p/12D3KooWRxDSg2H7ThEJyn4HNkL1ixsqm6PgjCtkTG1hm7NpYG4Q,/dns/node-5/tcp/15600/p2p/12D3KooWG9S868XrL1wzeUbMXDtBTAaxwuqktAzUodFFES8uoTGz,/dns/node-6/tcp/15600/p2p/12D3KooWFatFVM1wyGnMUwJrMW7YwD6j32iq5SCA9S7e386biZ73
+      --p2p.peerAliases=node-1-validator,node-2-validator,node-4-validator,node-5,node-6
       --node.alias=node-3-validator
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029
@@ -130,10 +134,11 @@ services:
       - ./config.json:/app/config.json:ro
     command: >
       ${COMMON_CONFIG}
-      ${AUTOPEERING_CONFIG}
       --db.path==${DB_PATH_V4:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_V4:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=f205f6c4525069f71f9c7e987d72421a16c7900056b494a2b85fdf7942cf906aefbdc580f5d1ce4ae3f86ccfe109c6cd76df9b0e710a437b2aa964358c7b9449
+      --p2p.peers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK,/dns/node-2-validator/tcp/15600/p2p/12D3KooWCropDmzpoLy8UrFg59M1oUx7k1UmQmuHrmN5RDgp6pVL,/dns/node-3-validator/tcp/15600/p2p/12D3KooWPr1mW33PGhv3oRbPQQDesN4THBB3WgnYsNzCfnQLr5QR,/dns/node-5/tcp/15600/p2p/12D3KooWG9S868XrL1wzeUbMXDtBTAaxwuqktAzUodFFES8uoTGz,/dns/node-6/tcp/15600/p2p/12D3KooWFatFVM1wyGnMUwJrMW7YwD6j32iq5SCA9S7e386biZ73
+      --p2p.peerAliases=node-1-validator,node-2-validator,node-3-validator,node-5,node-6
       --node.alias=node-4-validator
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029
@@ -162,10 +167,11 @@ services:
       - ./config.json:/app/config.json:ro
     command: >
       ${COMMON_CONFIG}
-      ${AUTOPEERING_CONFIG}
       --db.path==${DB_PATH_node5:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_node5:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=03feb3bcd25e57f75697bb329e6e0100680431e4c45c85bc013da2aea9e9d0345e08a0c37407dc62369deebc64cb0fb3ea26127d19d141ee7fb8eaa6b92019d7
+      --p2p.peers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK,/dns/node-2-validator/tcp/15600/p2p/12D3KooWCropDmzpoLy8UrFg59M1oUx7k1UmQmuHrmN5RDgp6pVL,/dns/node-3-validator/tcp/15600/p2p/12D3KooWPr1mW33PGhv3oRbPQQDesN4THBB3WgnYsNzCfnQLr5QR,/dns/node-4-validator/tcp/15600/p2p/12D3KooWRxDSg2H7ThEJyn4HNkL1ixsqm6PgjCtkTG1hm7NpYG4Q,/dns/node-6/tcp/15600/p2p/12D3KooWFatFVM1wyGnMUwJrMW7YwD6j32iq5SCA9S7e386biZ73
+      --p2p.peerAliases=node-1-validator,node-2-validator,node-3-validator,node-4-validator,node-6
       --node.alias=node-5
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029
@@ -196,10 +202,11 @@ services:
       - ./config.json:/app/config.json:ro
     command: >
       ${COMMON_CONFIG}
-      ${AUTOPEERING_CONFIG}
       --db.path==${DB_PATH_node6:-/app/data/database}
       --protocol.snapshot.path=${SNAPSHOT_PATH_node6:-/app/data/snapshots/snapshot.bin}
       --p2p.identityPrivateKey=7d1491df3ef334dee988d6cdfc4b430b996d520bd63375a01d6754f8cee979b855b200fbea8c936ea1937a27e6ad72a7c9a21c1b17c2bd3c11f1f6994d813446
+      --p2p.peers=/dns/node-1-validator/tcp/15600/p2p/12D3KooWRVt4Engu27jHnF2RjfX48EqiAqJbgLfFdHNt3Vn6BtJK,/dns/node-2-validator/tcp/15600/p2p/12D3KooWCropDmzpoLy8UrFg59M1oUx7k1UmQmuHrmN5RDgp6pVL,/dns/node-3-validator/tcp/15600/p2p/12D3KooWPr1mW33PGhv3oRbPQQDesN4THBB3WgnYsNzCfnQLr5QR,/dns/node-4-validator/tcp/15600/p2p/12D3KooWRxDSg2H7ThEJyn4HNkL1ixsqm6PgjCtkTG1hm7NpYG4Q,/dns/node-5/tcp/15600/p2p/12D3KooWG9S868XrL1wzeUbMXDtBTAaxwuqktAzUodFFES8uoTGz
+      --p2p.peerAliases=node-1-validator,node-2-validator,node-3-validator,node-4-validator,node-5
       --node.alias=node-6
       --inx.enabled=true
       --inx.bindAddress=0.0.0.0:9029