diff --git a/.github/workflows/continuous-integration-e2e.yaml b/.github/workflows/continuous-integration-e2e.yaml index 129c5213bf7..6f94080c42a 100644 --- a/.github/workflows/continuous-integration-e2e.yaml +++ b/.github/workflows/continuous-integration-e2e.yaml @@ -54,7 +54,6 @@ jobs: FAUCET_PROVIDER_PARAMS: '{"baseUrl":"http://localhost:8090/v2","mnemonic":"fire method repair aware foot tray accuse brother popular olive find account sick rocket next"}' KEY_MANAGEMENT_PROVIDER: 'inMemory' KEY_MANAGEMENT_PARAMS: '{"bip32Ed25519": "CML", "accountIndex": 0, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"vacant violin soft weird deliver render brief always monitor general maid smart jelly core drastic erode echo there clump dizzy card filter option defense"}' - KEY_MANAGEMENT_PARAMS_PEER: '{"bip32Ed25519": "CML", "accountIndex": 1, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"vacant violin soft weird deliver render brief always monitor general maid smart jelly core drastic erode echo there clump dizzy card filter option defense"}' MINT_POLICY_SIGNER_MNEMONICS1: 'regular holiday analyst private inform tank squirrel lock false maximum hip gorilla sting toss income retreat quality kiss ability cart marine badge impulse trend' MINT_POLICY_SIGNER_MNEMONICS2: 'pistol denial nature horse spy exact sport end horse solar decade route arrive slender grass shoot remain ski skull glow only wasp detect trigger' ASSET_PROVIDER: 'http' diff --git a/.github/workflows/nightly-e2e.yaml b/.github/workflows/nightly-e2e.yaml index ecac4035ea0..5a0cff72f6b 100644 --- a/.github/workflows/nightly-e2e.yaml +++ b/.github/workflows/nightly-e2e.yaml @@ -65,7 +65,6 @@ jobs: FAUCET_PROVIDER_PARAMS: '{"baseUrl":"http://localhost:8090/v2","mnemonic":"fire method repair aware foot tray accuse brother popular olive find account sick rocket next"}' KEY_MANAGEMENT_PROVIDER: 'inMemory' KEY_MANAGEMENT_PARAMS: '{"bip32Ed25519": "CML", "accountIndex": 0, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"vacant violin soft weird deliver render brief always monitor general maid smart jelly core drastic erode echo there clump dizzy card filter option defense"}' - KEY_MANAGEMENT_PARAMS_PEER: '{"bip32Ed25519": "CML", "accountIndex": 1, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"vacant violin soft weird deliver render brief always monitor general maid smart jelly core drastic erode echo there clump dizzy card filter option defense"}' MINT_POLICY_SIGNER_MNEMONICS1: 'regular holiday analyst private inform tank squirrel lock false maximum hip gorilla sting toss income retreat quality kiss ability cart marine badge impulse trend' MINT_POLICY_SIGNER_MNEMONICS2: 'pistol denial nature horse spy exact sport end horse solar decade route arrive slender grass shoot remain ski skull glow only wasp detect trigger' ASSET_PROVIDER: 'http' diff --git a/packages/e2e/.env.example b/packages/e2e/.env.example index 41b890a6dff..8c3f9c69124 100644 --- a/packages/e2e/.env.example +++ b/packages/e2e/.env.example @@ -13,9 +13,6 @@ KEY_MANAGEMENT_PARAMS='{"bip32Ed25519": "CML", "accountIndex": 0, "chainId":{"ne #KEY_MANAGEMENT_PARAMS='{"bip32Ed25519": "CML", "accountIndex": 0, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"phrase raw learn suspect inmate powder combine apology regular hero gain chronic fruit ritual short screen goddess odor keen creek brand today kit machine"}' #KEY_MANAGEMENT_PARAMS='{"bip32Ed25519": "CML", "accountIndex": 0, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"salon zoo engage submit smile frost later decide wing sight chaos renew lizard rely canal coral scene hobby scare step bus leaf tobacco slice"}' -# Key managment setup for tests with two wallets -KEY_MANAGEMENT_PARAMS_PEER='{"bip32Ed25519": "CML", "accountIndex": 1, "chainId":{"networkId": 0, "networkMagic": 888}, "passphrase":"some_passphrase","mnemonic":"vacant violin soft weird deliver render brief always monitor general maid smart jelly core drastic erode echo there clump dizzy card filter option defense"}' - # Mnemonics for mint policy signers MINT_POLICY_SIGNER_MNEMONICS1='regular holiday analyst private inform tank squirrel lock false maximum hip gorilla sting toss income retreat quality kiss ability cart marine badge impulse trend' MINT_POLICY_SIGNER_MNEMONICS2='pistol denial nature horse spy exact sport end horse solar decade route arrive slender grass shoot remain ski skull glow only wasp detect trigger' diff --git a/packages/e2e/src/environment.ts b/packages/e2e/src/environment.ts index 5f86c46bddc..61f8522bf7e 100644 --- a/packages/e2e/src/environment.ts +++ b/packages/e2e/src/environment.ts @@ -82,7 +82,6 @@ const validators = { CHAIN_HISTORY_PROVIDER_PARAMS: providerParams(), DB_SYNC_CONNECTION_STRING: str(), KEY_MANAGEMENT_PARAMS: keyManagementParams(), - KEY_MANAGEMENT_PARAMS_PEER: keyManagementParams(), KEY_MANAGEMENT_PROVIDER: str(), LOGGER_MIN_SEVERITY: str({ default: 'info' }), MINT_POLICY_SIGNER_MNEMONICS1: str(), @@ -142,7 +141,6 @@ export const walletVariables = [ 'CHAIN_HISTORY_PROVIDER', 'CHAIN_HISTORY_PROVIDER_PARAMS', 'KEY_MANAGEMENT_PARAMS', - 'KEY_MANAGEMENT_PARAMS_PEER', 'KEY_MANAGEMENT_PROVIDER', 'MINT_POLICY_SIGNER_MNEMONICS1', 'MINT_POLICY_SIGNER_MNEMONICS2', diff --git a/packages/e2e/test/wallet/SingleAddressWallet/delegation.test.ts b/packages/e2e/test/wallet/SingleAddressWallet/delegation.test.ts index 9c98bc5d243..4e069f1a92f 100644 --- a/packages/e2e/test/wallet/SingleAddressWallet/delegation.test.ts +++ b/packages/e2e/test/wallet/SingleAddressWallet/delegation.test.ts @@ -48,14 +48,8 @@ describe('SingleAddressWallet/delegation', () => { beforeAll(async () => { jest.setTimeout(180_000); - wallet1 = await getWallet({ env, logger, name: 'Test Wallet 1', polling: { interval: 500 } }); - wallet2 = await getWallet({ - customKeyParams: env.KEY_MANAGEMENT_PARAMS_PEER, - env, - logger, - name: 'Test Wallet 2', - polling: { interval: 500 } - }); + wallet1 = await getWallet({ env, idx: 0, logger, name: 'Test Wallet 1', polling: { interval: 500 } }); + wallet2 = await getWallet({ env, idx: 1, logger, name: 'Test Wallet 2', polling: { interval: 500 } }); await Promise.all([waitForWalletStateSettle(wallet1.wallet), waitForWalletStateSettle(wallet2.wallet)]); });