From 337ca0b440fdb22289f5e1ea9be0191ef9c4eb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Wed, 11 Dec 2024 10:57:17 +0100 Subject: [PATCH] name functions consistently in ChainSender interface --- aggoracle/chaingersender/evm.go | 6 +++--- aggoracle/e2e_test.go | 2 +- aggoracle/oracle.go | 8 ++++---- claimsponsor/e2e_test.go | 2 +- lastgersync/e2e_test.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aggoracle/chaingersender/evm.go b/aggoracle/chaingersender/evm.go index b60bfca3e..30f12c9cf 100644 --- a/aggoracle/chaingersender/evm.go +++ b/aggoracle/chaingersender/evm.go @@ -82,16 +82,16 @@ func NewEVMChainGERSender( }, nil } -func (c *EVMChainGERSender) IsGERAlreadyInjected(ger common.Hash) (bool, error) { +func (c *EVMChainGERSender) IsGERInjected(ger common.Hash) (bool, error) { timestamp, err := c.gerContract.GlobalExitRootMap(&bind.CallOpts{Pending: false}, ger) if err != nil { return false, fmt.Errorf("error calling gerContract.GlobalExitRootMap: %w", err) } - return timestamp.Cmp(big.NewInt(0)) != 0, nil + return timestamp.Cmp(common.Big0) != 0, nil } -func (c *EVMChainGERSender) UpdateGERWaitUntilMined(ctx context.Context, ger common.Hash) error { +func (c *EVMChainGERSender) InjectGER(ctx context.Context, ger common.Hash) error { ticker := time.NewTicker(c.waitPeriodMonitorTx) defer ticker.Stop() diff --git a/aggoracle/e2e_test.go b/aggoracle/e2e_test.go index 24988e607..090bd57c3 100644 --- a/aggoracle/e2e_test.go +++ b/aggoracle/e2e_test.go @@ -36,7 +36,7 @@ func runTest( time.Sleep(time.Millisecond * 150) expectedGER, err := gerL1Contract.GetLastGlobalExitRoot(&bind.CallOpts{Pending: false}) require.NoError(t, err) - isInjected, err := sender.IsGERAlreadyInjected(expectedGER) + isInjected, err := sender.IsGERInjected(expectedGER) require.NoError(t, err) require.True(t, isInjected, fmt.Sprintf("iteration %d, GER: %s", i, common.Bytes2Hex(expectedGER[:]))) } diff --git a/aggoracle/oracle.go b/aggoracle/oracle.go index f4d961c43..82378f300 100644 --- a/aggoracle/oracle.go +++ b/aggoracle/oracle.go @@ -20,8 +20,8 @@ type L1InfoTreer interface { } type ChainSender interface { - IsGERAlreadyInjected(ger common.Hash) (bool, error) - UpdateGERWaitUntilMined(ctx context.Context, ger common.Hash) error + IsGERInjected(ger common.Hash) (bool, error) + InjectGER(ctx context.Context, ger common.Hash) error } type AggOracle struct { @@ -85,7 +85,7 @@ func (a *AggOracle) processLatestGER(ctx context.Context, blockNumToFetch *uint6 // Update the block number for the next iteration *blockNumToFetch = blockNum - alreadyInjected, err := a.chainSender.IsGERAlreadyInjected(gerToInject) + alreadyInjected, err := a.chainSender.IsGERInjected(gerToInject) if err != nil { return fmt.Errorf("error checking if GER is already injected: %w", err) } @@ -95,7 +95,7 @@ func (a *AggOracle) processLatestGER(ctx context.Context, blockNumToFetch *uint6 } a.logger.Infof("injecting new GER: %s", gerToInject.Hex()) - if err := a.chainSender.UpdateGERWaitUntilMined(ctx, gerToInject); err != nil { + if err := a.chainSender.InjectGER(ctx, gerToInject); err != nil { return fmt.Errorf("error injecting GER %s: %w", gerToInject.Hex(), err) } diff --git a/claimsponsor/e2e_test.go b/claimsponsor/e2e_test.go index 9d9ae4c2a..c5d669f7d 100644 --- a/claimsponsor/e2e_test.go +++ b/claimsponsor/e2e_test.go @@ -56,7 +56,7 @@ func TestE2EL1toEVML2(t *testing.T) { time.Sleep(time.Millisecond * 300) expectedGER, err := env.GERL1Contract.GetLastGlobalExitRoot(&bind.CallOpts{Pending: false}) require.NoError(t, err) - isInjected, err := env.AggOracleSender.IsGERAlreadyInjected(expectedGER) + isInjected, err := env.AggOracleSender.IsGERInjected(expectedGER) require.NoError(t, err) require.True(t, isInjected, fmt.Sprintf("iteration %d, GER: %s", i, common.Bytes2Hex(expectedGER[:]))) diff --git a/lastgersync/e2e_test.go b/lastgersync/e2e_test.go index 718425af0..ca956a20d 100644 --- a/lastgersync/e2e_test.go +++ b/lastgersync/e2e_test.go @@ -44,7 +44,7 @@ func TestE2E(t *testing.T) { time.Sleep(time.Millisecond * 150) expectedGER, err := env.GERL1Contract.GetLastGlobalExitRoot(&bind.CallOpts{Pending: false}) require.NoError(t, err) - isInjected, err := env.AggOracleSender.IsGERAlreadyInjected(expectedGER) + isInjected, err := env.AggOracleSender.IsGERInjected(expectedGER) require.NoError(t, err) require.True(t, isInjected, fmt.Sprintf("iteration %d, GER: %s", i, common.Bytes2Hex(expectedGER[:])))