Skip to content

Commit

Permalink
fix: merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Maddiaa0 committed Sep 11, 2024
1 parent 6f417fc commit cde6283
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,13 @@ describe('L1Publisher integration', () => {

const expectedData = encodeFunctionData({
abi: RollupAbi,
functionName: 'propose',
functionName: 'proposeWithBody',
args: [
`0x${block.header.toBuffer().toString('hex')}`,
`0x${block.archive.root.toBuffer().toString('hex')}`,
`0x${block.header.hash().toBuffer().toString('hex')}`,
[],
[],
`0x${block.body.toBuffer().toString('hex')}`,
],
});
Expand Down Expand Up @@ -530,12 +531,13 @@ describe('L1Publisher integration', () => {
i == 0
? encodeFunctionData({
abi: RollupAbi,
functionName: 'propose',
functionName: 'proposeWithBody',
args: [
`0x${block.header.toBuffer().toString('hex')}`,
`0x${block.archive.root.toBuffer().toString('hex')}`,
`0x${block.header.hash().toBuffer().toString('hex')}`,
[],
[],
`0x${block.body.toBuffer().toString('hex')}`,
],
})
Expand All @@ -547,6 +549,7 @@ describe('L1Publisher integration', () => {
`0x${block.archive.root.toBuffer().toString('hex')}`,
`0x${block.header.hash().toBuffer().toString('hex')}`,
[],
[]
],
});
expect(ethTx.input).toEqual(expectedData);
Expand Down

0 comments on commit cde6283

Please sign in to comment.