@@ -10,7 +10,8 @@ import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
1010import { Fr } from '@aztec/aztec.js/fields' ;
1111import type { Logger } from '@aztec/aztec.js/log' ;
1212import type { AztecNode } from '@aztec/aztec.js/node' ;
13- import { BlockNumber } from '@aztec/foundation/branded-types' ;
13+ import type { RollupCheatCodes } from '@aztec/ethereum/test' ;
14+ import { BlockNumber , EpochNumber } from '@aztec/foundation/branded-types' ;
1415import { Timer } from '@aztec/foundation/timer' ;
1516import { TokenContract } from '@aztec/noir-contracts.js/Token' ;
1617import { SiloedTag , Tag } from '@aztec/stdlib/logs' ;
@@ -97,11 +98,13 @@ describe('e2e_node_rpc_perf', () => {
9798 let aztecNode : AztecNode ;
9899 let wallet : TestWallet ;
99100 let ownerAddress : AztecAddress ;
101+ let rollupCheatCodes : RollupCheatCodes ;
100102 let teardown : ( ) => Promise < void > ;
101103 const benchmarkResults : BenchmarkResult [ ] = [ ] ;
102104
103105 // Data collected during block building for use in benchmarks
104106 let blockNumber : number ;
107+ let epoch : EpochNumber ;
105108 let contractAddress : AztecAddress ;
106109 let contractClassId : Fr ;
107110 let blockHash : Fr ;
@@ -138,6 +141,7 @@ describe('e2e_node_rpc_perf', () => {
138141 aztecNode,
139142 wallet,
140143 accounts : [ ownerAddress ] ,
144+ cheatCodes : { rollup : rollupCheatCodes } ,
141145 } = await setup ( 1 , {
142146 archiverPollingIntervalMS : 200 ,
143147 sequencerPollingIntervalMS : 200 ,
@@ -162,6 +166,8 @@ describe('e2e_node_rpc_perf', () => {
162166
163167 blockNumber = await aztecNode . getBlockNumber ( ) ;
164168
169+ epoch = await rollupCheatCodes . getEpoch ( ) ;
170+
165171 // Get block hash and archive for benchmarking getBlockByHash/getBlockByArchive
166172 const block = await aztecNode . getBlock ( BlockNumber ( blockNumber ) ) ;
167173 blockHash = await block ! . hash ( ) ;
@@ -457,9 +463,7 @@ describe('e2e_node_rpc_perf', () => {
457463 } ) ;
458464
459465 it ( 'benchmarks getL2ToL1Messages' , async ( ) => {
460- const { stats } = await benchmark ( 'getL2ToL1Messages' , ( ) =>
461- aztecNode . getL2ToL1Messages ( BlockNumber ( blockNumber ) ) ,
462- ) ;
466+ const { stats } = await benchmark ( 'getL2ToL1Messages' , ( ) => aztecNode . getL2ToL1Messages ( epoch ) ) ;
463467 addResult ( 'getL2ToL1Messages' , stats ) ;
464468 expect ( stats . avg ) . toBeLessThan ( 2000 ) ;
465469 } ) ;
0 commit comments