From f53e2d11d48d09a0d07075d7fc5c52504dd05dd7 Mon Sep 17 00:00:00 2001 From: Pedro Novais <1478752+jpnovais@users.noreply.github.com> Date: Wed, 16 Oct 2024 18:59:10 +0100 Subject: [PATCH] fix coordinator local overrides file (#199) * fix coordinator local overrides file * coordinator: removes broken test --- ...oordinator-local-dev.config.overrides.toml | 15 +++++-------- .../blockcreation/TracesFilesManagerTest.kt | 22 ------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/config/coordinator/coordinator-local-dev.config.overrides.toml b/config/coordinator/coordinator-local-dev.config.overrides.toml index 9a0a301fe..30ab4b87f 100644 --- a/config/coordinator/coordinator-local-dev.config.overrides.toml +++ b/config/coordinator/coordinator-local-dev.config.overrides.toml @@ -38,15 +38,12 @@ non-canonical-raw-traces-directory = "tmp/local/traces/raw-non-canonical" [state-manager] endpoints=["http://127.0.0.1:8998/"] -[dynamic-gas-price-service] -geth-gas-price-update-recipients=[ - "http://127.0.0.1:8645", - "http://127.0.0.1:8845" -] -besu-gas-price-update-recipients=[ - "http://127.0.0.1:8545/" -] -extra-data-update-recipient="http://127.0.0.1:8545/" +[l2-network-gas-pricing.extra-data-pricing-propagation] +extra-data-update-recipient = "http://127.0.0.1:8545/" + +[l2-network-gas-pricing.json-rpc-pricing-propagation] +geth-gas-price-update-recipients = ["http://127.0.0.1:8845"] +besu-gas-price-update-recipients = [] [l1] rpc-endpoint="http://127.0.0.1:8445" diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesFilesManagerTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesFilesManagerTest.kt index e3ea8aa11..e74982bac 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesFilesManagerTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesFilesManagerTest.kt @@ -15,7 +15,6 @@ import java.nio.file.Files import java.nio.file.Path import java.util.concurrent.ExecutionException import kotlin.io.path.createFile -import kotlin.io.path.exists import kotlin.time.Duration.Companion.milliseconds class TracesFilesManagerTest { @@ -31,8 +30,6 @@ class TracesFilesManagerTest { Bytes32.fromHexString("0x00000000000000000000000000000000000000000000000000000000000000a1") private val block2Hash2 = Bytes32.fromHexString("0x00000000000000000000000000000000000000000000000000000000000000a2") - private val block20Hash = - Bytes32.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000001") private lateinit var block1TracesFile: Path private lateinit var block2TracesFile1: Path private lateinit var block2TracesFile2: Path @@ -171,25 +168,6 @@ class TracesFilesManagerTest { assertThat(block2TracesFile2).doesNotExist() } - @Test - fun `cleanNonCanonicalSiblingsByHeight handles case sensitivity correctly`() { - val mixedCaseHash = block2Hash1.toHexString().uppercase() - val tracesFileName = TracesFiles.rawTracesFileNameSupplierV1( - 2uL, - Bytes32.fromHexString(mixedCaseHash), - tracesVersion, - tracesFileExtension - ) - val mixedCaseFile = tracesDir.resolve(Path.of(tracesFileName)) - Files.createFile(mixedCaseFile) - Files.createFile(block2TracesFile2) - - tracesFilesManager.cleanNonCanonicalSiblingsByHeight(2uL, block2Hash1).get() - - assertThat(mixedCaseFile).exists() - assertThat(block2TracesFile2).doesNotExist() - } - @Test fun `waitRawTracesGenerationOf handles extremely short polling interval`() { val configWithShortPolling = config.copy(pollingInterval = 1.milliseconds)