From 83945ca54b0dc029fdc39a5702f5140cc1a672c2 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Sat, 22 Feb 2020 00:52:21 +0800 Subject: [PATCH] Shift Stateutils to State Package (#4921) * shift over * new changes * imports * Merge branch 'master' into shiftUtils --- beacon-chain/blockchain/BUILD.bazel | 2 +- beacon-chain/core/blocks/BUILD.bazel | 2 +- beacon-chain/core/blocks/block_operations.go | 2 +- beacon-chain/core/state/BUILD.bazel | 2 +- beacon-chain/core/state/transition.go | 2 +- beacon-chain/state/BUILD.bazel | 4 ++-- {shared => beacon-chain/state}/stateutil/BUILD.bazel | 7 +++++-- {shared => beacon-chain/state}/stateutil/arrays.go | 0 {shared => beacon-chain/state}/stateutil/attestations.go | 0 {shared => beacon-chain/state}/stateutil/blocks.go | 0 {shared => beacon-chain/state}/stateutil/helpers.go | 0 {shared => beacon-chain/state}/stateutil/state_root.go | 0 .../state}/stateutil/state_root_cache_fuzz_test.go | 0 .../state}/stateutil/state_root_test.go | 2 +- {shared => beacon-chain/state}/stateutil/validators.go | 0 beacon-chain/state/types.go | 2 +- beacon-chain/state/types_test.go | 2 +- proto/testing/BUILD.bazel | 6 +++--- proto/testing/ssz_static_test.go | 2 +- 19 files changed, 19 insertions(+), 16 deletions(-) rename {shared => beacon-chain/state}/stateutil/BUILD.bazel (89%) rename {shared => beacon-chain/state}/stateutil/arrays.go (100%) rename {shared => beacon-chain/state}/stateutil/attestations.go (100%) rename {shared => beacon-chain/state}/stateutil/blocks.go (100%) rename {shared => beacon-chain/state}/stateutil/helpers.go (100%) rename {shared => beacon-chain/state}/stateutil/state_root.go (100%) rename {shared => beacon-chain/state}/stateutil/state_root_cache_fuzz_test.go (100%) rename {shared => beacon-chain/state}/stateutil/state_root_test.go (98%) rename {shared => beacon-chain/state}/stateutil/validators.go (100%) diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index 8a3d3290feb..ba0328054ef 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -85,12 +85,12 @@ go_test( "//beacon-chain/db/testing:go_default_library", "//beacon-chain/p2p:go_default_library", "//beacon-chain/powchain:go_default_library", + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", - "//shared/stateutil:go_default_library", "//shared/testutil:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/beacon-chain/core/blocks/BUILD.bazel b/beacon-chain/core/blocks/BUILD.bazel index ae2316a4147..313503d5076 100644 --- a/beacon-chain/core/blocks/BUILD.bazel +++ b/beacon-chain/core/blocks/BUILD.bazel @@ -16,6 +16,7 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/validators:go_default_library", "//beacon-chain/state:go_default_library", + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", @@ -25,7 +26,6 @@ go_library( "//shared/mathutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/stateutil:go_default_library", "//shared/trieutil:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go index 67125bf6616..9a4f2fe06c1 100644 --- a/beacon-chain/core/blocks/block_operations.go +++ b/beacon-chain/core/blocks/block_operations.go @@ -16,6 +16,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" @@ -25,7 +26,6 @@ import ( "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" - "github.com/prysmaticlabs/prysm/shared/stateutil" "github.com/prysmaticlabs/prysm/shared/trieutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/beacon-chain/core/state/BUILD.bazel b/beacon-chain/core/state/BUILD.bazel index 20825cc075a..d67f5dba0aa 100644 --- a/beacon-chain/core/state/BUILD.bazel +++ b/beacon-chain/core/state/BUILD.bazel @@ -25,10 +25,10 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/state/interop:go_default_library", "//beacon-chain/state:go_default_library", + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", - "//shared/stateutil:go_default_library", "//shared/traceutil:go_default_library", "//shared/trieutil:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/state/transition.go index 256df5f431b..ef5b2670f60 100644 --- a/beacon-chain/core/state/transition.go +++ b/beacon-chain/core/state/transition.go @@ -17,9 +17,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/stateutil" "github.com/prysmaticlabs/prysm/shared/traceutil" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/BUILD.bazel b/beacon-chain/state/BUILD.bazel index f356f740179..bfcc8ef0197 100644 --- a/beacon-chain/state/BUILD.bazel +++ b/beacon-chain/state/BUILD.bazel @@ -17,12 +17,12 @@ go_library( ], deps = [ "//beacon-chain/core/state/stateutils:go_default_library", + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/memorypool:go_default_library", "//shared/params:go_default_library", - "//shared/stateutil:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_protolambda_zssz//merkle:go_default_library", @@ -39,11 +39,11 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/interop:go_default_library", "//shared/params:go_default_library", - "//shared/stateutil:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", "@com_github_prysmaticlabs_go_ssz//:go_default_library", diff --git a/shared/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel similarity index 89% rename from shared/stateutil/BUILD.bazel rename to beacon-chain/state/stateutil/BUILD.bazel index ffecd7d4f71..8d1798360b4 100644 --- a/shared/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -10,8 +10,11 @@ go_library( "state_root.go", "validators.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/stateutil", - visibility = ["//visibility:public"], + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil", + visibility = [ + "//beacon-chain:__subpackages__", + "//proto/testing:__subpackages__", + ], deps = [ "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/shared/stateutil/arrays.go b/beacon-chain/state/stateutil/arrays.go similarity index 100% rename from shared/stateutil/arrays.go rename to beacon-chain/state/stateutil/arrays.go diff --git a/shared/stateutil/attestations.go b/beacon-chain/state/stateutil/attestations.go similarity index 100% rename from shared/stateutil/attestations.go rename to beacon-chain/state/stateutil/attestations.go diff --git a/shared/stateutil/blocks.go b/beacon-chain/state/stateutil/blocks.go similarity index 100% rename from shared/stateutil/blocks.go rename to beacon-chain/state/stateutil/blocks.go diff --git a/shared/stateutil/helpers.go b/beacon-chain/state/stateutil/helpers.go similarity index 100% rename from shared/stateutil/helpers.go rename to beacon-chain/state/stateutil/helpers.go diff --git a/shared/stateutil/state_root.go b/beacon-chain/state/stateutil/state_root.go similarity index 100% rename from shared/stateutil/state_root.go rename to beacon-chain/state/stateutil/state_root.go diff --git a/shared/stateutil/state_root_cache_fuzz_test.go b/beacon-chain/state/stateutil/state_root_cache_fuzz_test.go similarity index 100% rename from shared/stateutil/state_root_cache_fuzz_test.go rename to beacon-chain/state/stateutil/state_root_cache_fuzz_test.go diff --git a/shared/stateutil/state_root_test.go b/beacon-chain/state/stateutil/state_root_test.go similarity index 98% rename from shared/stateutil/state_root_test.go rename to beacon-chain/state/stateutil/state_root_test.go index cab39c70f35..272fb760a2b 100644 --- a/shared/stateutil/state_root_test.go +++ b/beacon-chain/state/stateutil/state_root_test.go @@ -8,11 +8,11 @@ import ( ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/stateutil" ) func init() { diff --git a/shared/stateutil/validators.go b/beacon-chain/state/stateutil/validators.go similarity index 100% rename from shared/stateutil/validators.go rename to beacon-chain/state/stateutil/validators.go diff --git a/beacon-chain/state/types.go b/beacon-chain/state/types.go index 93c057b832d..b64ad65e1c7 100644 --- a/beacon-chain/state/types.go +++ b/beacon-chain/state/types.go @@ -9,12 +9,12 @@ import ( "github.com/protolambda/zssz/merkle" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" coreutils "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/memorypool" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/stateutil" ) // Reference structs are shared across BeaconState copies to understand when the state must use diff --git a/beacon-chain/state/types_test.go b/beacon-chain/state/types_test.go index 6e7cd80bcb1..de3d7eebcbe 100644 --- a/beacon-chain/state/types_test.go +++ b/beacon-chain/state/types_test.go @@ -9,11 +9,11 @@ import ( ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/stateutil" ) func TestBeaconState_ProtoBeaconStateCompatibility(t *testing.T) { diff --git a/proto/testing/BUILD.bazel b/proto/testing/BUILD.bazel index 80793d6b62f..7637efa80a9 100644 --- a/proto/testing/BUILD.bazel +++ b/proto/testing/BUILD.bazel @@ -46,10 +46,10 @@ go_test( embed = [":go_default_library"], tags = ["spectest"], deps = [ + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params/spectest:go_default_library", - "//shared/stateutil:go_default_library", "//shared/testutil:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", @@ -76,10 +76,10 @@ go_test( "spectest", ], deps = [ + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params/spectest:go_default_library", - "//shared/stateutil:go_default_library", "//shared/testutil:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", @@ -101,10 +101,10 @@ go_test( ], tags = ["spectest"], deps = [ + "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params/spectest:go_default_library", - "//shared/stateutil:go_default_library", "//shared/testutil:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", diff --git a/proto/testing/ssz_static_test.go b/proto/testing/ssz_static_test.go index 3fe742bed98..dad6c5c8c40 100644 --- a/proto/testing/ssz_static_test.go +++ b/proto/testing/ssz_static_test.go @@ -9,9 +9,9 @@ import ( ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/params/spectest" - "github.com/prysmaticlabs/prysm/shared/stateutil" "github.com/prysmaticlabs/prysm/shared/testutil" )