Skip to content

Commit d97760c

Browse files
committed
chore(fast-inbox): drop inert isFirstBlock parameter from blob-data fixtures (A-1384)
1 parent bad79d0 commit d97760c

3 files changed

Lines changed: 10 additions & 37 deletions

File tree

yarn-project/archiver/src/l1/data_retrieval.test.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ describe('data_retrieval', () => {
1616
const body3 = await Body.random({ txsPerBlock: 2 });
1717

1818
// Convert to BlockBlobData
19-
const block1BlobData = makeBlockBlobDataFromBody(body1, BlockNumber(1), true, 1000);
20-
const block2BlobData = makeBlockBlobDataFromBody(body2, BlockNumber(2), false, 2000);
21-
const block3BlobData = makeBlockBlobDataFromBody(body3, BlockNumber(3), false, 3000);
19+
const block1BlobData = makeBlockBlobDataFromBody(body1, BlockNumber(1), 1000);
20+
const block2BlobData = makeBlockBlobDataFromBody(body2, BlockNumber(2), 2000);
21+
const block3BlobData = makeBlockBlobDataFromBody(body3, BlockNumber(3), 3000);
2222

2323
// Calculate total blob fields for checkpoint end marker
2424
const numBlobFields = 100; // Approximate, doesn't need to be exact for this test
@@ -96,7 +96,7 @@ describe('data_retrieval', () => {
9696

9797
it('handles single-block checkpoint', async () => {
9898
const body1 = await Body.random({ txsPerBlock: 3 });
99-
const block1BlobData = makeBlockBlobDataFromBody(body1, BlockNumber(1), true, 5000);
99+
const block1BlobData = makeBlockBlobDataFromBody(body1, BlockNumber(1), 5000);
100100

101101
const checkpointBlobData: CheckpointBlobData = {
102102
blocks: [block1BlobData],
@@ -134,15 +134,9 @@ describe('data_retrieval', () => {
134134
* Helper to create a BlockBlobData from a Body. This ensures the blob data is compatible
135135
* with Body.fromTxBlobData.
136136
*/
137-
function makeBlockBlobDataFromBody(
138-
body: Body,
139-
blockNumber: BlockNumber,
140-
isFirstBlock: boolean,
141-
seed: number,
142-
): BlockBlobData {
137+
function makeBlockBlobDataFromBody(body: Body, blockNumber: BlockNumber, seed: number): BlockBlobData {
143138
const blockEndBlobData = makeBlockEndBlobData({
144139
seed,
145-
isFirstBlock,
146140
blockEndMarker: {
147141
numTxs: body.txEffects.length,
148142
blockNumber,

yarn-project/blob-lib/src/encoding/block_blob_data.test.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,8 @@ import { decodeBlockBlobData, encodeBlockBlobData } from './block_blob_data.js';
22
import { makeBlockBlobData } from './fixtures.js';
33

44
describe('block blob data', () => {
5-
it('encode and decode first block', () => {
6-
const blockBlobData = makeBlockBlobData({ isFirstBlock: true, numTxs: 3 });
7-
expect(blockBlobData.txs.length).toBe(3);
8-
expect(blockBlobData.l1ToL2MessageRoot).toBeDefined();
9-
10-
const encoded = encodeBlockBlobData(blockBlobData);
11-
const decoded = decodeBlockBlobData(encoded);
12-
expect(decoded).toEqual(blockBlobData);
13-
});
14-
15-
it('encode and decode non-first block (still carries the l1-to-l2 root)', () => {
16-
const blockBlobData = makeBlockBlobData({ isFirstBlock: false, numTxs: 3 });
5+
it('encodes and decodes a block carrying the l1-to-l2 message root', () => {
6+
const blockBlobData = makeBlockBlobData({ numTxs: 3 });
177
expect(blockBlobData.txs.length).toBe(3);
188
// Every block carries the l1-to-l2 message tree root post-flip (AZIP-22 Fast Inbox).
199
expect(blockBlobData.l1ToL2MessageRoot).toBeDefined();

yarn-project/blob-lib/src/encoding/fixtures.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,9 @@ export function makeBlockEndStateField({
131131
}
132132

133133
export function makeBlockEndBlobData({
134-
// Accepted for call-site compatibility, but no longer read: post-flip every block carries the
135-
// l1-to-l2 message tree root regardless of position, so the blob format no longer branches on it.
136-
isFirstBlock: _isFirstBlock = true,
137134
seed = 1,
138135
...overrides
139-
}: { seed?: number; isFirstBlock?: boolean } & Partial<
140-
Omit<BlockEndBlobData, 'blockEndMarker' | 'blockEndStateField'>
141-
> & {
136+
}: { seed?: number } & Partial<Omit<BlockEndBlobData, 'blockEndMarker' | 'blockEndStateField'>> & {
142137
blockEndMarker?: Partial<BlockEndMarker>;
143138
blockEndStateField?: Partial<BlockEndStateField>;
144139
} = {}): BlockEndBlobData {
@@ -162,11 +157,10 @@ export function makeBlockEndBlobData({
162157

163158
export function makeBlockBlobData({
164159
numTxs = 1,
165-
isFirstBlock = true,
166160
isFullTx = false,
167161
seed = 1,
168162
...overrides
169-
}: { numTxs?: number; isFirstBlock?: boolean; isFullTx?: boolean; seed?: number } & Partial<
163+
}: { numTxs?: number; isFullTx?: boolean; seed?: number } & Partial<
170164
Parameters<typeof makeBlockEndBlobData>[0]
171165
> = {}): BlockBlobData {
172166
return {
@@ -176,7 +170,6 @@ export function makeBlockBlobData({
176170
blockEndMarker: {
177171
numTxs,
178172
},
179-
isFirstBlock,
180173
...overrides,
181174
}),
182175
};
@@ -196,11 +189,7 @@ export function makeCheckpointBlobData({
196189
} & Partial<CheckpointBlobData> = {}): CheckpointBlobData {
197190
const blocks =
198191
overrides.blocks ??
199-
makeTuple(
200-
numBlocks,
201-
i => makeBlockBlobData({ numTxs: numTxsPerBlock, isFirstBlock: i === seed, isFullTx, seed: seed + i * 0x1000 }),
202-
seed,
203-
);
192+
makeTuple(numBlocks, i => makeBlockBlobData({ numTxs: numTxsPerBlock, isFullTx, seed: seed + i * 0x1000 }), seed);
204193

205194
const numBlobFields =
206195
overrides.checkpointEndMarker?.numBlobFields ??

0 commit comments

Comments
 (0)