From 4779723cddfe64eccaec375f0cb60b9a6277e994 Mon Sep 17 00:00:00 2001 From: Dmitry Murzin Date: Thu, 30 May 2024 11:34:12 +0300 Subject: [PATCH] fix: Fix test `generate_peers_deterministically` (#4665) Signed-off-by: Dmitry Murzin --- tools/swarm/src/compose.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/swarm/src/compose.rs b/tools/swarm/src/compose.rs index 99bfd684886..d3bb7810695 100644 --- a/tools/swarm/src/compose.rs +++ b/tools/swarm/src/compose.rs @@ -746,19 +746,19 @@ mod tests { let expected = expect_test::expect![[r#" version: '3.8' services: - iroha0: + irohad0: build: ./iroha-cloned platform: linux/amd64 environment: CHAIN_ID: 00000000-0000-0000-0000-000000000000 - PUBLIC_KEY: ed0120F0321EB4139163C35F88BF78520FF7071499D7F4E79854550028A196C7B49E13 - PRIVATE_KEY: 8026405F8D1291BF6B762EE748A87182345D135FD167062857AA4F20BA39F25E74C4B0F0321EB4139163C35F88BF78520FF7071499D7F4E79854550028A196C7B49E13 + PUBLIC_KEY: ed0120AB0B22BC053C954A4CA7CF451872E9C5B971F0DA5D92133648226D02E3ABB611 + PRIVATE_KEY: 80264078DEFA845766A579C9F84CE8840864615B2913073E1321930DD087F77017F1A4AB0B22BC053C954A4CA7CF451872E9C5B971F0DA5D92133648226D02E3ABB611 P2P_ADDRESS: 0.0.0.0:1337 API_ADDRESS: 0.0.0.0:8080 GENESIS_PUBLIC_KEY: ed01203420F48A9EEB12513B8EB7DAF71979CE80A1013F5F341C10DCDA4F6AA19F97A9 GENESIS_PRIVATE_KEY: 8026405A6D5F06A90D29AD906E2F6EA8B41B4EF187849D0D397081A4A15FFCBE71E7C73420F48A9EEB12513B8EB7DAF71979CE80A1013F5F341C10DCDA4F6AA19F97A9 GENESIS_FILE: /config/genesis.json - SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha2:1339","public_key":"ed0120312C1B7B5DE23D366ADCF23CD6DB92CE18B2AA283C7D9F5033B969C2DC2B92F4"},{"address":"iroha3:1340","public_key":"ed0120854457B2E3D6082181DA73DC01C1E6F93A72D0C45268DC8845755287E98A5DEE"},{"address":"iroha1:1338","public_key":"ed0120A88554AA5C86D28D0EEBEC497235664433E807881CD31E12A1AF6C4D8B0F026C"}]' + SUMERAGI_TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed0120222832FD8DF02882F07C13554DBA5BAE10C07A97E4AE7C2114DC05E95C3E6E32"},{"address":"irohad1:1338","public_key":"ed0120ACD30C7213EF11C4EC1006C6039E4089FC39C9BD211F688B866BCA59C8073883"},{"address":"irohad3:1340","public_key":"ed0120FB35DF84B28FAF8BB5A24D6910EFD7D7B22101EB99BFC74C4213CB1E7215F91B"}]' ports: - 1337:1337 - 8080:8080 @@ -772,17 +772,17 @@ mod tests { timeout: 1s retries: 30 start_period: 4s - iroha1: + irohad1: build: ./iroha-cloned platform: linux/amd64 environment: CHAIN_ID: 00000000-0000-0000-0000-000000000000 - PUBLIC_KEY: ed0120A88554AA5C86D28D0EEBEC497235664433E807881CD31E12A1AF6C4D8B0F026C - PRIVATE_KEY: 8026408D34D2C6A699C61E7A9D5AABBBD07629029DFB4F9A0800D65AA6570113EDB465A88554AA5C86D28D0EEBEC497235664433E807881CD31E12A1AF6C4D8B0F026C + PUBLIC_KEY: ed0120ACD30C7213EF11C4EC1006C6039E4089FC39C9BD211F688B866BCA59C8073883 + PRIVATE_KEY: 80264083CA4DC66124BB71EB7498FFCD0BFE981554F9E1426133A9999400A65B8D5636ACD30C7213EF11C4EC1006C6039E4089FC39C9BD211F688B866BCA59C8073883 P2P_ADDRESS: 0.0.0.0:1338 API_ADDRESS: 0.0.0.0:8081 GENESIS_PUBLIC_KEY: ed01203420F48A9EEB12513B8EB7DAF71979CE80A1013F5F341C10DCDA4F6AA19F97A9 - SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha2:1339","public_key":"ed0120312C1B7B5DE23D366ADCF23CD6DB92CE18B2AA283C7D9F5033B969C2DC2B92F4"},{"address":"iroha3:1340","public_key":"ed0120854457B2E3D6082181DA73DC01C1E6F93A72D0C45268DC8845755287E98A5DEE"},{"address":"iroha0:1337","public_key":"ed0120F0321EB4139163C35F88BF78520FF7071499D7F4E79854550028A196C7B49E13"}]' + SUMERAGI_TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed0120222832FD8DF02882F07C13554DBA5BAE10C07A97E4AE7C2114DC05E95C3E6E32"},{"address":"irohad0:1337","public_key":"ed0120AB0B22BC053C954A4CA7CF451872E9C5B971F0DA5D92133648226D02E3ABB611"},{"address":"irohad3:1340","public_key":"ed0120FB35DF84B28FAF8BB5A24D6910EFD7D7B22101EB99BFC74C4213CB1E7215F91B"}]' ports: - 1338:1338 - 8081:8081 @@ -795,17 +795,17 @@ mod tests { timeout: 1s retries: 30 start_period: 4s - iroha2: + irohad2: build: ./iroha-cloned platform: linux/amd64 environment: CHAIN_ID: 00000000-0000-0000-0000-000000000000 - PUBLIC_KEY: ed0120312C1B7B5DE23D366ADCF23CD6DB92CE18B2AA283C7D9F5033B969C2DC2B92F4 - PRIVATE_KEY: 802640CF4515A82289F312868027568C0DA0EE3F0FDE7FEF1B69DEB47B19FDE7CBC169312C1B7B5DE23D366ADCF23CD6DB92CE18B2AA283C7D9F5033B969C2DC2B92F4 + PUBLIC_KEY: ed0120222832FD8DF02882F07C13554DBA5BAE10C07A97E4AE7C2114DC05E95C3E6E32 + PRIVATE_KEY: 802640DC39D66EF98C566D1641B5C971C17385EA6CBFD9029627C481AD777A2E31B7BD222832FD8DF02882F07C13554DBA5BAE10C07A97E4AE7C2114DC05E95C3E6E32 P2P_ADDRESS: 0.0.0.0:1339 API_ADDRESS: 0.0.0.0:8082 GENESIS_PUBLIC_KEY: ed01203420F48A9EEB12513B8EB7DAF71979CE80A1013F5F341C10DCDA4F6AA19F97A9 - SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha3:1340","public_key":"ed0120854457B2E3D6082181DA73DC01C1E6F93A72D0C45268DC8845755287E98A5DEE"},{"address":"iroha1:1338","public_key":"ed0120A88554AA5C86D28D0EEBEC497235664433E807881CD31E12A1AF6C4D8B0F026C"},{"address":"iroha0:1337","public_key":"ed0120F0321EB4139163C35F88BF78520FF7071499D7F4E79854550028A196C7B49E13"}]' + SUMERAGI_TRUSTED_PEERS: '[{"address":"irohad0:1337","public_key":"ed0120AB0B22BC053C954A4CA7CF451872E9C5B971F0DA5D92133648226D02E3ABB611"},{"address":"irohad1:1338","public_key":"ed0120ACD30C7213EF11C4EC1006C6039E4089FC39C9BD211F688B866BCA59C8073883"},{"address":"irohad3:1340","public_key":"ed0120FB35DF84B28FAF8BB5A24D6910EFD7D7B22101EB99BFC74C4213CB1E7215F91B"}]' ports: - 1339:1339 - 8082:8082 @@ -818,17 +818,17 @@ mod tests { timeout: 1s retries: 30 start_period: 4s - iroha3: + irohad3: build: ./iroha-cloned platform: linux/amd64 environment: CHAIN_ID: 00000000-0000-0000-0000-000000000000 - PUBLIC_KEY: ed0120854457B2E3D6082181DA73DC01C1E6F93A72D0C45268DC8845755287E98A5DEE - PRIVATE_KEY: 802640AB0E99C2B845B4AC7B3E88D25A860793C7EB600A25C66C75CBA0BAE91E955AA6854457B2E3D6082181DA73DC01C1E6F93A72D0C45268DC8845755287E98A5DEE + PUBLIC_KEY: ed0120FB35DF84B28FAF8BB5A24D6910EFD7D7B22101EB99BFC74C4213CB1E7215F91B + PRIVATE_KEY: 8026409F42DA01C65923DF0703284BF76AD475D6EE141A9C2F75C9C534DA11835D77D8FB35DF84B28FAF8BB5A24D6910EFD7D7B22101EB99BFC74C4213CB1E7215F91B P2P_ADDRESS: 0.0.0.0:1340 API_ADDRESS: 0.0.0.0:8083 GENESIS_PUBLIC_KEY: ed01203420F48A9EEB12513B8EB7DAF71979CE80A1013F5F341C10DCDA4F6AA19F97A9 - SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha2:1339","public_key":"ed0120312C1B7B5DE23D366ADCF23CD6DB92CE18B2AA283C7D9F5033B969C2DC2B92F4"},{"address":"iroha1:1338","public_key":"ed0120A88554AA5C86D28D0EEBEC497235664433E807881CD31E12A1AF6C4D8B0F026C"},{"address":"iroha0:1337","public_key":"ed0120F0321EB4139163C35F88BF78520FF7071499D7F4E79854550028A196C7B49E13"}]' + SUMERAGI_TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed0120222832FD8DF02882F07C13554DBA5BAE10C07A97E4AE7C2114DC05E95C3E6E32"},{"address":"irohad0:1337","public_key":"ed0120AB0B22BC053C954A4CA7CF451872E9C5B971F0DA5D92133648226D02E3ABB611"},{"address":"irohad1:1338","public_key":"ed0120ACD30C7213EF11C4EC1006C6039E4089FC39C9BD211F688B866BCA59C8073883"}]' ports: - 1340:1340 - 8083:8083