From c47f99f2e401927f67c6a11efe5f1bb8cc0036fa Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Fri, 17 Jan 2025 21:39:17 +0100 Subject: [PATCH] Minor --- core/chains/evm/txm/orchestrator.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/chains/evm/txm/orchestrator.go b/core/chains/evm/txm/orchestrator.go index ae981e153b0..e727d572875 100644 --- a/core/chains/evm/txm/orchestrator.go +++ b/core/chains/evm/txm/orchestrator.go @@ -18,9 +18,9 @@ import ( commontypes "github.com/smartcontractkit/chainlink-common/pkg/types" "github.com/smartcontractkit/chainlink-common/pkg/utils" - "github.com/smartcontractkit/chainlink/v2/common/txmgr" - txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types" - "github.com/smartcontractkit/chainlink/v2/common/types" + "github.com/smartcontractkit/chainlink-framework/chains" + "github.com/smartcontractkit/chainlink-framework/chains/txmgr" + txmgrtypes "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas" txmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txm/types" @@ -39,8 +39,8 @@ type OrchestratorKeystore interface { } type OrchestratorAttemptBuilder[ - BLOCK_HASH types.Hashable, - HEAD types.Head[BLOCK_HASH], + BLOCK_HASH chains.Hashable, + HEAD chains.Head[BLOCK_HASH], ] interface { services.Service OnNewLongestChain(ctx context.Context, head HEAD) @@ -48,8 +48,8 @@ type OrchestratorAttemptBuilder[ // Generics are necessary to keep TXMv2 backwards compatible type Orchestrator[ - BLOCK_HASH types.Hashable, - HEAD types.Head[BLOCK_HASH], + BLOCK_HASH chains.Hashable, + HEAD chains.Head[BLOCK_HASH], ] struct { services.StateMachine lggr logger.SugaredLogger @@ -62,7 +62,7 @@ type Orchestrator[ resumeCallback txmgr.ResumeCallback } -func NewTxmOrchestrator[BLOCK_HASH types.Hashable, HEAD types.Head[BLOCK_HASH]]( +func NewTxmOrchestrator[BLOCK_HASH chains.Hashable, HEAD chains.Head[BLOCK_HASH]]( lggr logger.Logger, chainID *big.Int, txm *Txm,