Skip to content

chore: use respective get endpoints for rollup test instead of only port-forward #20327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 1 commit into from
Feb 10, 2026
Merged

chore: use respective get endpoints for rollup test instead of only port-forward #20327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 13 additions & 18 deletions yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { retryUntil } from '@aztec/foundation/retry';
import { GSEAbi, GovernanceAbi, TestERC20Abi } from '@aztec/l1-artifacts';

import { jest } from '@jest/globals';
import type { ChildProcess } from 'child_process';
import fs from 'fs';
import omit from 'lodash.omit';
import path from 'path';
Expand All @@ -19,12 +18,13 @@ import { mnemonicToAccount } from 'viem/accounts';

import { MNEMONIC } from '../fixtures/fixtures.js';
import {
type ServiceEndpoint,
getEthereumEndpoint,
getGitProjectRoot,
getRPCEndpoint,
rollAztecPods,
runProjectScript,
setupEnvironment,
startPortForwardForEthereum,
startPortForwardForRPC,
updateSequencersConfig,
waitForResourceByLabel,
} from './utils.js';
Expand Down Expand Up @@ -109,25 +109,21 @@ describe('spartan_upgrade_rollup_version', () => {
let nodeInfo: NodeInfo;
let ETHEREUM_HOSTS: string[];
let originalL1ContractAddresses: L1ContractAddresses;
const forwardProcesses: ChildProcess[] = [];
const endpoints: ServiceEndpoint[] = [];
jest.setTimeout(3 * 60 * 60 * 1000); // Governance flow can take a while

afterAll(() => {
forwardProcesses.forEach(p => p.kill());
endpoints.forEach(e => e.process?.kill());
});

beforeAll(async () => {
const { process: aztecRpcProcess, port: aztecRpcPort } = await startPortForwardForRPC(config.NAMESPACE);
const { process: ethereumProcess, port: ethereumPort } = await startPortForwardForEthereum(config.NAMESPACE);
forwardProcesses.push(aztecRpcProcess);
forwardProcesses.push(ethereumProcess);
const rpcEndpoint = await getRPCEndpoint(config.NAMESPACE);
const ethEndpoint = await getEthereumEndpoint(config.NAMESPACE);
endpoints.push(rpcEndpoint, ethEndpoint);

const nodeUrl = `http://127.0.0.1:${aztecRpcPort}`;
const ethereumUrl = `http://127.0.0.1:${ethereumPort}`;

aztecNode = createAztecNodeClient(nodeUrl);
aztecNode = createAztecNodeClient(rpcEndpoint.url);
nodeInfo = await aztecNode.getNodeInfo();
ETHEREUM_HOSTS = [ethereumUrl];
ETHEREUM_HOSTS = [ethEndpoint.url];

originalL1ContractAddresses = omit(nodeInfo.l1ContractAddresses, [
'slashFactoryAddress',
Expand Down Expand Up @@ -601,10 +597,9 @@ describe('spartan_upgrade_rollup_version', () => {
}

// Reconnect to the node via RPC after pods restart
const { process: aztecRpcProcess2, port: aztecRpcPort2 } = await startPortForwardForRPC(config.NAMESPACE);
forwardProcesses.push(aztecRpcProcess2);
const nodeUrl2 = `http://127.0.0.1:${aztecRpcPort2}`;
aztecNode = createAztecNodeClient(nodeUrl2);
const rpcEndpoint2 = await getRPCEndpoint(config.NAMESPACE);
endpoints.push(rpcEndpoint2);
aztecNode = createAztecNodeClient(rpcEndpoint2.url);

const newNodeInfo = await aztecNode.getNodeInfo();

Expand Down
Loading