From 856dde497b297ff2952f548e41be05345433263e Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Tue, 13 Aug 2019 12:35:34 -0400 Subject: [PATCH] Move sync to deprecated- prefix (#3190) * Move sync to deprecated_ prefix * do not use underscore * fix --- beacon-chain/{sync => deprecated-sync}/BUILD.bazel | 4 ++-- .../{sync => deprecated-sync}/initial-sync/BUILD.bazel | 2 +- .../{sync => deprecated-sync}/initial-sync/helpers.go | 0 .../{sync => deprecated-sync}/initial-sync/metrics.go | 0 .../{sync => deprecated-sync}/initial-sync/service.go | 0 .../{sync => deprecated-sync}/initial-sync/service_test.go | 0 .../{sync => deprecated-sync}/initial-sync/sync_blocks.go | 0 .../{sync => deprecated-sync}/initial-sync/sync_state.go | 0 beacon-chain/{sync => deprecated-sync}/metrics.go | 0 beacon-chain/{sync => deprecated-sync}/querier.go | 0 beacon-chain/{sync => deprecated-sync}/querier_test.go | 0 beacon-chain/{sync => deprecated-sync}/receive_block.go | 0 beacon-chain/{sync => deprecated-sync}/receive_block_test.go | 0 beacon-chain/{sync => deprecated-sync}/regular_sync.go | 0 beacon-chain/{sync => deprecated-sync}/regular_sync_test.go | 0 beacon-chain/{sync => deprecated-sync}/service.go | 2 +- beacon-chain/{sync => deprecated-sync}/service_test.go | 0 beacon-chain/node/BUILD.bazel | 2 +- beacon-chain/node/node.go | 2 +- beacon-chain/rpc/BUILD.bazel | 2 +- beacon-chain/rpc/node_server.go | 2 +- beacon-chain/rpc/service.go | 2 +- 22 files changed, 9 insertions(+), 9 deletions(-) rename beacon-chain/{sync => deprecated-sync}/BUILD.bazel (94%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/BUILD.bazel (96%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/helpers.go (100%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/metrics.go (100%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/service.go (100%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/service_test.go (100%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/sync_blocks.go (100%) rename beacon-chain/{sync => deprecated-sync}/initial-sync/sync_state.go (100%) rename beacon-chain/{sync => deprecated-sync}/metrics.go (100%) rename beacon-chain/{sync => deprecated-sync}/querier.go (100%) rename beacon-chain/{sync => deprecated-sync}/querier_test.go (100%) rename beacon-chain/{sync => deprecated-sync}/receive_block.go (100%) rename beacon-chain/{sync => deprecated-sync}/receive_block_test.go (100%) rename beacon-chain/{sync => deprecated-sync}/regular_sync.go (100%) rename beacon-chain/{sync => deprecated-sync}/regular_sync_test.go (100%) rename beacon-chain/{sync => deprecated-sync}/service.go (97%) rename beacon-chain/{sync => deprecated-sync}/service_test.go (100%) diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/deprecated-sync/BUILD.bazel similarity index 94% rename from beacon-chain/sync/BUILD.bazel rename to beacon-chain/deprecated-sync/BUILD.bazel index c1273e267..668ae5d79 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/deprecated-sync/BUILD.bazel @@ -9,14 +9,14 @@ go_library( "regular_sync.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/beacon-chain/sync", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/db:go_default_library", + "//beacon-chain/deprecated-sync/initial-sync:go_default_library", "//beacon-chain/operations:go_default_library", - "//beacon-chain/sync/initial-sync:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/deprecated-sync/initial-sync/BUILD.bazel similarity index 96% rename from beacon-chain/sync/initial-sync/BUILD.bazel rename to beacon-chain/deprecated-sync/initial-sync/BUILD.bazel index d79f739be..9f89455e0 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/deprecated-sync/initial-sync/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "sync_blocks.go", "sync_state.go", ], - importpath = "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync/initial-sync", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/sync/initial-sync/helpers.go b/beacon-chain/deprecated-sync/initial-sync/helpers.go similarity index 100% rename from beacon-chain/sync/initial-sync/helpers.go rename to beacon-chain/deprecated-sync/initial-sync/helpers.go diff --git a/beacon-chain/sync/initial-sync/metrics.go b/beacon-chain/deprecated-sync/initial-sync/metrics.go similarity index 100% rename from beacon-chain/sync/initial-sync/metrics.go rename to beacon-chain/deprecated-sync/initial-sync/metrics.go diff --git a/beacon-chain/sync/initial-sync/service.go b/beacon-chain/deprecated-sync/initial-sync/service.go similarity index 100% rename from beacon-chain/sync/initial-sync/service.go rename to beacon-chain/deprecated-sync/initial-sync/service.go diff --git a/beacon-chain/sync/initial-sync/service_test.go b/beacon-chain/deprecated-sync/initial-sync/service_test.go similarity index 100% rename from beacon-chain/sync/initial-sync/service_test.go rename to beacon-chain/deprecated-sync/initial-sync/service_test.go diff --git a/beacon-chain/sync/initial-sync/sync_blocks.go b/beacon-chain/deprecated-sync/initial-sync/sync_blocks.go similarity index 100% rename from beacon-chain/sync/initial-sync/sync_blocks.go rename to beacon-chain/deprecated-sync/initial-sync/sync_blocks.go diff --git a/beacon-chain/sync/initial-sync/sync_state.go b/beacon-chain/deprecated-sync/initial-sync/sync_state.go similarity index 100% rename from beacon-chain/sync/initial-sync/sync_state.go rename to beacon-chain/deprecated-sync/initial-sync/sync_state.go diff --git a/beacon-chain/sync/metrics.go b/beacon-chain/deprecated-sync/metrics.go similarity index 100% rename from beacon-chain/sync/metrics.go rename to beacon-chain/deprecated-sync/metrics.go diff --git a/beacon-chain/sync/querier.go b/beacon-chain/deprecated-sync/querier.go similarity index 100% rename from beacon-chain/sync/querier.go rename to beacon-chain/deprecated-sync/querier.go diff --git a/beacon-chain/sync/querier_test.go b/beacon-chain/deprecated-sync/querier_test.go similarity index 100% rename from beacon-chain/sync/querier_test.go rename to beacon-chain/deprecated-sync/querier_test.go diff --git a/beacon-chain/sync/receive_block.go b/beacon-chain/deprecated-sync/receive_block.go similarity index 100% rename from beacon-chain/sync/receive_block.go rename to beacon-chain/deprecated-sync/receive_block.go diff --git a/beacon-chain/sync/receive_block_test.go b/beacon-chain/deprecated-sync/receive_block_test.go similarity index 100% rename from beacon-chain/sync/receive_block_test.go rename to beacon-chain/deprecated-sync/receive_block_test.go diff --git a/beacon-chain/sync/regular_sync.go b/beacon-chain/deprecated-sync/regular_sync.go similarity index 100% rename from beacon-chain/sync/regular_sync.go rename to beacon-chain/deprecated-sync/regular_sync.go diff --git a/beacon-chain/sync/regular_sync_test.go b/beacon-chain/deprecated-sync/regular_sync_test.go similarity index 100% rename from beacon-chain/sync/regular_sync_test.go rename to beacon-chain/deprecated-sync/regular_sync_test.go diff --git a/beacon-chain/sync/service.go b/beacon-chain/deprecated-sync/service.go similarity index 97% rename from beacon-chain/sync/service.go rename to beacon-chain/deprecated-sync/service.go index fff6c7c85..3567b6df3 100644 --- a/beacon-chain/sync/service.go +++ b/beacon-chain/deprecated-sync/service.go @@ -5,8 +5,8 @@ import ( "errors" "github.com/prysmaticlabs/prysm/beacon-chain/db" + initialsync "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync/initial-sync" "github.com/prysmaticlabs/prysm/beacon-chain/operations" - initialsync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/service_test.go b/beacon-chain/deprecated-sync/service_test.go similarity index 100% rename from beacon-chain/sync/service_test.go rename to beacon-chain/deprecated-sync/service_test.go diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index a86949760..7d68a6ce5 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -13,12 +13,12 @@ go_library( "//beacon-chain/attestation:go_default_library", "//beacon-chain/blockchain:go_default_library", "//beacon-chain/db:go_default_library", + "//beacon-chain/deprecated-sync:go_default_library", "//beacon-chain/flags:go_default_library", "//beacon-chain/gateway:go_default_library", "//beacon-chain/operations:go_default_library", "//beacon-chain/powchain:go_default_library", "//beacon-chain/rpc:go_default_library", - "//beacon-chain/sync:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1alpha1:go_default_library", "//shared:go_default_library", diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index 541053566..5b611c8b8 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -17,12 +17,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/attestation" "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/beacon-chain/db" + rbcsync "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync" "github.com/prysmaticlabs/prysm/beacon-chain/flags" "github.com/prysmaticlabs/prysm/beacon-chain/gateway" "github.com/prysmaticlabs/prysm/beacon-chain/operations" "github.com/prysmaticlabs/prysm/beacon-chain/powchain" "github.com/prysmaticlabs/prysm/beacon-chain/rpc" - rbcsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/debug" diff --git a/beacon-chain/rpc/BUILD.bazel b/beacon-chain/rpc/BUILD.bazel index 92141a269..1bf95168c 100644 --- a/beacon-chain/rpc/BUILD.bazel +++ b/beacon-chain/rpc/BUILD.bazel @@ -22,8 +22,8 @@ go_library( "//beacon-chain/core/state:go_default_library", "//beacon-chain/core/state/stateutils:go_default_library", "//beacon-chain/db:go_default_library", + "//beacon-chain/deprecated-sync:go_default_library", "//beacon-chain/operations:go_default_library", - "//beacon-chain/sync:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/rpc/v1:go_default_library", "//proto/eth/v1alpha1:go_default_library", diff --git a/beacon-chain/rpc/node_server.go b/beacon-chain/rpc/node_server.go index 05019c7c6..d4234f942 100644 --- a/beacon-chain/rpc/node_server.go +++ b/beacon-chain/rpc/node_server.go @@ -7,7 +7,7 @@ import ( ptypes "github.com/gogo/protobuf/types" "github.com/prysmaticlabs/prysm/beacon-chain/db" - "github.com/prysmaticlabs/prysm/beacon-chain/sync" + sync "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc" diff --git a/beacon-chain/rpc/service.go b/beacon-chain/rpc/service.go index bfc9da447..0d031fceb 100644 --- a/beacon-chain/rpc/service.go +++ b/beacon-chain/rpc/service.go @@ -16,8 +16,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/db" + sync "github.com/prysmaticlabs/prysm/beacon-chain/deprecated-sync" "github.com/prysmaticlabs/prysm/beacon-chain/operations" - "github.com/prysmaticlabs/prysm/beacon-chain/sync" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"