Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@goran-ethernal
goran-ethernal committed Dec 25, 2024
1 parent 13de295 commit 466be1e
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion aggoracle/chaingersender/evm_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/agglayer/aggkit/aggoracle/mocks"
"github.com/agglayer/aggkit/log"
"github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -160,6 +160,7 @@ func TestEVMChainGERSender_IsGERInjected(t *testing.T) {
} else {
require.NoError(t, err)
}

require.Equal(t, tt.expectedResult, result)

mockL2GERManager.AssertExpectations(t)
Expand Down
2 changes: 1 addition & 1 deletion aggregator/aggregator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"testing"
"time"

"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer"
"github.com/agglayer/aggkit/agglayer"
mocks "github.com/agglayer/aggkit/aggregator/mocks"
"github.com/agglayer/aggkit/aggregator/prover"
"github.com/agglayer/aggkit/config/types"
"github.com/agglayer/aggkit/log"
rpctypes "github.com/agglayer/aggkit/rpc/types"
"github.com/agglayer/aggkit/state"
"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer"
"github.com/ethereum/go-ethereum/common"
ethTypes "github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions aggregator/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"math/big"

"github.com/agglayer/aggkit/config/types"
"github.com/agglayer/aggkit/log"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
syncronizerConfig "github.com/0xPolygonHermez/zkevm-synchronizer-l1/config"
"github.com/agglayer/aggkit/config/types"
"github.com/agglayer/aggkit/log"
)

// SettlementBackend is the type of the settlement backend
Expand Down
4 changes: 2 additions & 2 deletions aggregator/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"database/sql"
"math/big"

"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
ethmanTypes "github.com/agglayer/aggkit/aggregator/ethmantypes"
"github.com/agglayer/aggkit/aggregator/prover"
"github.com/agglayer/aggkit/db"
"github.com/agglayer/aggkit/rpc/types"
"github.com/agglayer/aggkit/state"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto/kzg4844"
Expand Down
2 changes: 1 addition & 1 deletion sequencesender/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package sequencesender

import (
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
"github.com/agglayer/aggkit/config/types"
"github.com/agglayer/aggkit/log"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
2 changes: 1 addition & 1 deletion sequencesender/ethtx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"sync/atomic"
"time"

"github.com/agglayer/aggkit/log"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
"github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/agglayer/aggkit/log"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
4 changes: 2 additions & 2 deletions sequencesender/ethtx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"testing"
"time"

"github.com/agglayer/aggkit/log"
"github.com/agglayer/aggkit/sequencesender/mocks"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/agglayer/aggkit/log"
"github.com/agglayer/aggkit/sequencesender/mocks"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions sequencesender/sequencesender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (
"sync/atomic"
"time"

"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
ethtxlog "github.com/0xPolygon/zkevm-ethtx-manager/log"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/agglayer/aggkit/etherman"
"github.com/agglayer/aggkit/log"
"github.com/agglayer/aggkit/rpc"
"github.com/agglayer/aggkit/rpc/types"
"github.com/agglayer/aggkit/sequencesender/seqsendertypes"
"github.com/agglayer/aggkit/sequencesender/txbuilder"
"github.com/agglayer/aggkit/state"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
ethtxlog "github.com/0xPolygon/zkevm-ethtx-manager/log"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
)
Expand Down
2 changes: 1 addition & 1 deletion sequencesender/sequencesender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"
"time"

ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
types2 "github.com/agglayer/aggkit/config/types"
"github.com/agglayer/aggkit/etherman"
"github.com/agglayer/aggkit/log"
Expand All @@ -15,7 +16,6 @@ import (
"github.com/agglayer/aggkit/sequencesender/seqsendertypes"
"github.com/agglayer/aggkit/sequencesender/txbuilder"
"github.com/agglayer/aggkit/state"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/mock"
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/ethtxmanmock_e2e.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
big "math/big"
"testing"

"github.com/agglayer/aggkit/log"
ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
"github.com/agglayer/aggkit/log"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
Expand Down

0 comments on commit 466be1e

Please sign in to comment.