From 5c1c24f898ce31d9a18c24ce4ce0625e22e6ba59 Mon Sep 17 00:00:00 2001 From: Mitchell Tracy Date: Mon, 18 Mar 2024 16:22:29 -0400 Subject: [PATCH] final cleanup --- l1-contracts/test/decoders/Decoders.t.sol | 6 +++--- .../end-to-end/src/integration_l1_publisher.test.ts | 4 ---- .../src/sequencer/abstract_phase_manager.ts | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/l1-contracts/test/decoders/Decoders.t.sol b/l1-contracts/test/decoders/Decoders.t.sol index 6372bc91fa0b..96374f7ccaf0 100644 --- a/l1-contracts/test/decoders/Decoders.t.sol +++ b/l1-contracts/test/decoders/Decoders.t.sol @@ -36,9 +36,9 @@ contract DecodersTest is DecoderBase { function testDecodeBlocks() public { _testDecodeBlock("mixed_block_0"); - // _testDecodeBlock("mixed_block_1"); - // _testDecodeBlock("empty_block_0"); - // _testDecodeBlock("empty_block_1"); + _testDecodeBlock("mixed_block_1"); + _testDecodeBlock("empty_block_0"); + _testDecodeBlock("empty_block_1"); } function _testDecodeBlock(string memory name) public virtual { diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts index 6465a35e6c0c..b98e3eb27599 100644 --- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts +++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts @@ -184,10 +184,6 @@ describe('L1Publisher integration', () => { processedTx.data.end.encryptedLogsHash = to2Fields(processedTx.encryptedLogs.hash()); processedTx.data.end.unencryptedLogsHash = to2Fields(processedTx.unencryptedLogs.hash()); - // expect( - // arrayNonEmptyLength(processedTx.data.combinedData.newNullifiers, SideEffectLinkedToNoteHash.isEmpty), - // ).toEqual(MAX_NEW_NULLIFIERS_PER_TX); - return processedTx; }; diff --git a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts index e06649e3c366..bcfcb18b4466 100644 --- a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts @@ -386,6 +386,7 @@ export abstract class AbstractPhaseManager { unencryptedLogsHash, unencryptedLogPreimagesLength, historicalHeader: this.historicalHeader, + // TODO(@just-mitch): need better mapping from simulator to revert code. reverted: result.reverted ? RevertCode.REVERTED : RevertCode.OK, }); }