From 823ed9d5fc7dddcac5d36f0cdd80e9313dbd1f4d Mon Sep 17 00:00:00 2001 From: Dmitry <98899785+mdqst@users.noreply.github.com> Date: Mon, 21 Apr 2025 15:25:13 +0300 Subject: [PATCH 1/2] refactor: duplicate functions into a single implementation --- src/mocks/ScrollChainMockBlob.sol | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mocks/ScrollChainMockBlob.sol b/src/mocks/ScrollChainMockBlob.sol index 3490f06a..fa789cbe 100644 --- a/src/mocks/ScrollChainMockBlob.sol +++ b/src/mocks/ScrollChainMockBlob.sol @@ -19,7 +19,7 @@ contract ScrollChainMockBlob is ScrollChain { address _messageQueueV2, address _verifier, address _system - ) ScrollChain(_chainId, _messageQueueV1, _messageQueueV2, _verifier, address(_system)) {} + ) ScrollChain(_chainId, _messageQueueV1, _messageQueueV2, _verifier, _system) {} /********************** * Internal Functions * @@ -30,7 +30,7 @@ contract ScrollChainMockBlob is ScrollChain { } function setLastFinalizedBatchIndex(uint256 index) external { - miscData.lastFinalizedBatchIndex = uint64(index); + miscData.lastFinalizedBatchIndex = uint64(index); // Оставил приведение типа, как в оригинале } function setFinalizedStateRoots(uint256 index, bytes32 value) external { @@ -48,10 +48,7 @@ contract ScrollChainMockBlob is ScrollChain { overrideBatchHashCheck = status; } - function _getBlobVersionedHash() internal virtual override returns (bytes32 _blobVersionedHash) { - _blobVersionedHash = blobhashes[0]; - } - + // Объединение двух функций _getBlobVersionedHash в одну. function _getBlobVersionedHash(uint256 index) internal virtual override returns (bytes32 _blobVersionedHash) { _blobVersionedHash = blobhashes[index]; } From 19cd7db44e09ade603dbd2fc637372161de64503 Mon Sep 17 00:00:00 2001 From: Dmitry <98899785+mdqst@users.noreply.github.com> Date: Mon, 21 Apr 2025 15:26:25 +0300 Subject: [PATCH 2/2] Update ScrollChainMockBlob.sol --- src/mocks/ScrollChainMockBlob.sol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mocks/ScrollChainMockBlob.sol b/src/mocks/ScrollChainMockBlob.sol index fa789cbe..89f9d19f 100644 --- a/src/mocks/ScrollChainMockBlob.sol +++ b/src/mocks/ScrollChainMockBlob.sol @@ -30,7 +30,7 @@ contract ScrollChainMockBlob is ScrollChain { } function setLastFinalizedBatchIndex(uint256 index) external { - miscData.lastFinalizedBatchIndex = uint64(index); // Оставил приведение типа, как в оригинале + miscData.lastFinalizedBatchIndex = uint64(index); } function setFinalizedStateRoots(uint256 index, bytes32 value) external { @@ -48,7 +48,6 @@ contract ScrollChainMockBlob is ScrollChain { overrideBatchHashCheck = status; } - // Объединение двух функций _getBlobVersionedHash в одну. function _getBlobVersionedHash(uint256 index) internal virtual override returns (bytes32 _blobVersionedHash) { _blobVersionedHash = blobhashes[index]; }