From 3c706847cb1c838e2af8140dce4807f2b146f57c Mon Sep 17 00:00:00 2001 From: Dmytro Biloshytskyi Date: Mon, 9 Sep 2024 15:05:19 +0300 Subject: [PATCH] Mocked SetTTDBlockClient function for Erigon --- .../engine-gnosis-erigon/clmock/clmock.go | 33 ++++++++++--------- .../engine-gnosis-erigon/helper/helper.go | 8 +++-- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go b/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go index fc5d640a67..42a91c2454 100644 --- a/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go +++ b/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go @@ -4,7 +4,6 @@ import ( "context" "crypto/sha256" "encoding/binary" - "encoding/json" "fmt" "math/big" "math/rand" @@ -274,21 +273,23 @@ func (cl *CLMocker) SetTTDBlockClient(ec client.EngineClient) { } cl.HeaderHistory[cl.LatestHeader.Number.Uint64()] = &cl.LatestHeader.Header - ctx, cancel = context.WithTimeout(cl.TestContext, globals.RPCTimeout) - defer cancel() - - if td, err := ec.GetTotalDifficulty(ctx); err != nil { - cl.Fatalf("CLMocker: Error getting total difficulty from engine client: %v", err) - panic(err) - } else if td.Cmp(ec.TerminalTotalDifficulty()) < 0 { - cl.Fatalf("CLMocker: Attempted to set TTD Block when TTD had not been reached: %d > %d", ec.TerminalTotalDifficulty(), td) - panic(err) - } else { - cl.Logf("CLMocker: TTD has been reached at block %d (%d>=%d)\n", cl.LatestHeader.Number, td, ec.TerminalTotalDifficulty()) - jsH, _ := json.MarshalIndent(cl.LatestHeader, "", " ") - cl.Logf("CLMocker: Client: %s, Block %d: %s\n", ec.ID(), cl.LatestHeader.Number, jsH) - cl.ChainTotalDifficulty = td - } + // ctx, cancel = context.WithTimeout(cl.TestContext, globals.RPCTimeout) + // defer cancel() + + // TODO: Commented TotalDifficulty related things to remove it in the future + + // if td, err := ec.GetTotalDifficulty(ctx); err != nil { + // cl.Fatalf("CLMocker: Error getting total difficulty from engine client: %v", err) + // panic(err) + // } else if td.Cmp(ec.TerminalTotalDifficulty()) < 0 { + // cl.Fatalf("CLMocker: Attempted to set TTD Block when TTD had not been reached: %d > %d", ec.TerminalTotalDifficulty(), td) + // panic(err) + // } else { + // cl.Logf("CLMocker: TTD has been reached at block %d (%d>=%d)\n", cl.LatestHeader.Number, td, ec.TerminalTotalDifficulty()) + // jsH, _ := json.MarshalIndent(cl.LatestHeader, "", " ") + // cl.Logf("CLMocker: Client: %s, Block %d: %s\n", ec.ID(), cl.LatestHeader.Number, jsH) + // cl.ChainTotalDifficulty = td + // } cl.TTDReached = true diff --git a/simulators/ethereum/engine-gnosis-erigon/helper/helper.go b/simulators/ethereum/engine-gnosis-erigon/helper/helper.go index 1ee4e176cd..0983bdf73b 100644 --- a/simulators/ethereum/engine-gnosis-erigon/helper/helper.go +++ b/simulators/ethereum/engine-gnosis-erigon/helper/helper.go @@ -315,12 +315,14 @@ func WaitForTTD(ec client.EngineClient, wg *sync.WaitGroup, done chan<- WaitTTDR for { select { case <-time.After(TTDCheckPeriod): - ttdReached, err := CheckTTD(ec, ctx) - if err == nil && ttdReached { + // ttdReached, err := CheckTTD(ec, ctx) + // TODO: Remove WaitForTTD in the future + ttdReached := true + if ttdReached { select { case done <- WaitTTDResponse{ ec: ec, - err: err, + err: nil, }: case <-ctx.Done(): }