From e7b14e490cce43090468f46f442c4bef153d6164 Mon Sep 17 00:00:00 2001 From: Stephen Buttolph Date: Tue, 2 Apr 2024 16:50:28 -0400 Subject: [PATCH] Move bootstrapping queue out of common (#2856) --- chains/manager.go | 2 +- snow/engine/avalanche/bootstrap/bootstrapper_test.go | 2 +- snow/engine/avalanche/bootstrap/config.go | 2 +- snow/engine/{common => avalanche/bootstrap}/queue/job.go | 0 snow/engine/{common => avalanche/bootstrap}/queue/jobs.go | 0 snow/engine/{common => avalanche/bootstrap}/queue/jobs_test.go | 0 snow/engine/{common => avalanche/bootstrap}/queue/parser.go | 0 snow/engine/{common => avalanche/bootstrap}/queue/state.go | 0 snow/engine/{common => avalanche/bootstrap}/queue/test_job.go | 0 .../engine/{common => avalanche/bootstrap}/queue/test_parser.go | 0 snow/engine/avalanche/bootstrap/tx_job.go | 2 +- snow/engine/avalanche/bootstrap/vertex_job.go | 2 +- 12 files changed, 5 insertions(+), 5 deletions(-) rename snow/engine/{common => avalanche/bootstrap}/queue/job.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/jobs.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/jobs_test.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/parser.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/state.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/test_job.go (100%) rename snow/engine/{common => avalanche/bootstrap}/queue/test_parser.go (100%) diff --git a/chains/manager.go b/chains/manager.go index c62519c757c9..f2c79547c205 100644 --- a/chains/manager.go +++ b/chains/manager.go @@ -29,10 +29,10 @@ import ( "github.com/ava-labs/avalanchego/network" "github.com/ava-labs/avalanchego/proto/pb/p2p" "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap/queue" "github.com/ava-labs/avalanchego/snow/engine/avalanche/state" "github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex" "github.com/ava-labs/avalanchego/snow/engine/common" - "github.com/ava-labs/avalanchego/snow/engine/common/queue" "github.com/ava-labs/avalanchego/snow/engine/common/tracker" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" "github.com/ava-labs/avalanchego/snow/engine/snowman/syncer" diff --git a/snow/engine/avalanche/bootstrap/bootstrapper_test.go b/snow/engine/avalanche/bootstrap/bootstrapper_test.go index 133e90519b66..8d8c107383e9 100644 --- a/snow/engine/avalanche/bootstrap/bootstrapper_test.go +++ b/snow/engine/avalanche/bootstrap/bootstrapper_test.go @@ -20,10 +20,10 @@ import ( "github.com/ava-labs/avalanchego/snow/choices" "github.com/ava-labs/avalanchego/snow/consensus/avalanche" "github.com/ava-labs/avalanchego/snow/consensus/snowstorm" + "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap/queue" "github.com/ava-labs/avalanchego/snow/engine/avalanche/getter" "github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex" "github.com/ava-labs/avalanchego/snow/engine/common" - "github.com/ava-labs/avalanchego/snow/engine/common/queue" "github.com/ava-labs/avalanchego/snow/engine/common/tracker" "github.com/ava-labs/avalanchego/snow/snowtest" "github.com/ava-labs/avalanchego/snow/validators" diff --git a/snow/engine/avalanche/bootstrap/config.go b/snow/engine/avalanche/bootstrap/config.go index a674c2758460..8151967abe9d 100644 --- a/snow/engine/avalanche/bootstrap/config.go +++ b/snow/engine/avalanche/bootstrap/config.go @@ -6,9 +6,9 @@ package bootstrap import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/snow" + "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap/queue" "github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex" "github.com/ava-labs/avalanchego/snow/engine/common" - "github.com/ava-labs/avalanchego/snow/engine/common/queue" "github.com/ava-labs/avalanchego/snow/engine/common/tracker" "github.com/ava-labs/avalanchego/snow/validators" ) diff --git a/snow/engine/common/queue/job.go b/snow/engine/avalanche/bootstrap/queue/job.go similarity index 100% rename from snow/engine/common/queue/job.go rename to snow/engine/avalanche/bootstrap/queue/job.go diff --git a/snow/engine/common/queue/jobs.go b/snow/engine/avalanche/bootstrap/queue/jobs.go similarity index 100% rename from snow/engine/common/queue/jobs.go rename to snow/engine/avalanche/bootstrap/queue/jobs.go diff --git a/snow/engine/common/queue/jobs_test.go b/snow/engine/avalanche/bootstrap/queue/jobs_test.go similarity index 100% rename from snow/engine/common/queue/jobs_test.go rename to snow/engine/avalanche/bootstrap/queue/jobs_test.go diff --git a/snow/engine/common/queue/parser.go b/snow/engine/avalanche/bootstrap/queue/parser.go similarity index 100% rename from snow/engine/common/queue/parser.go rename to snow/engine/avalanche/bootstrap/queue/parser.go diff --git a/snow/engine/common/queue/state.go b/snow/engine/avalanche/bootstrap/queue/state.go similarity index 100% rename from snow/engine/common/queue/state.go rename to snow/engine/avalanche/bootstrap/queue/state.go diff --git a/snow/engine/common/queue/test_job.go b/snow/engine/avalanche/bootstrap/queue/test_job.go similarity index 100% rename from snow/engine/common/queue/test_job.go rename to snow/engine/avalanche/bootstrap/queue/test_job.go diff --git a/snow/engine/common/queue/test_parser.go b/snow/engine/avalanche/bootstrap/queue/test_parser.go similarity index 100% rename from snow/engine/common/queue/test_parser.go rename to snow/engine/avalanche/bootstrap/queue/test_parser.go diff --git a/snow/engine/avalanche/bootstrap/tx_job.go b/snow/engine/avalanche/bootstrap/tx_job.go index 17a2dcb53127..62a664ddc157 100644 --- a/snow/engine/avalanche/bootstrap/tx_job.go +++ b/snow/engine/avalanche/bootstrap/tx_job.go @@ -14,8 +14,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/snow/choices" "github.com/ava-labs/avalanchego/snow/consensus/snowstorm" + "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap/queue" "github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex" - "github.com/ava-labs/avalanchego/snow/engine/common/queue" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" ) diff --git a/snow/engine/avalanche/bootstrap/vertex_job.go b/snow/engine/avalanche/bootstrap/vertex_job.go index 21c0b93ed937..a9326c08fc78 100644 --- a/snow/engine/avalanche/bootstrap/vertex_job.go +++ b/snow/engine/avalanche/bootstrap/vertex_job.go @@ -14,8 +14,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/snow/choices" "github.com/ava-labs/avalanchego/snow/consensus/avalanche" + "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap/queue" "github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex" - "github.com/ava-labs/avalanchego/snow/engine/common/queue" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" )