From 15485f50c3cd583acb75fb9f8ab3fde518c8ca8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= Date: Thu, 27 Jan 2022 12:02:16 +0100 Subject: [PATCH] Fix native state imports (#10140) --- beacon-chain/state/state-native/v2/BUILD.bazel | 3 +-- beacon-chain/state/state-native/v2/beacon_state_mainnet.go | 2 +- beacon-chain/state/state-native/v2/beacon_state_minimal.go | 2 +- beacon-chain/state/state-native/v2/getters_validator.go | 2 +- beacon-chain/state/state-native/v2/state_trie.go | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/beacon-chain/state/state-native/v2/BUILD.bazel b/beacon-chain/state/state-native/v2/BUILD.bazel index 36bea4a9c..9dc6154bc 100644 --- a/beacon-chain/state/state-native/v2/BUILD.bazel +++ b/beacon-chain/state/state-native/v2/BUILD.bazel @@ -43,12 +43,11 @@ go_library( ], deps = [ "//beacon-chain/state:go_default_library", - "//beacon-chain/state/fieldtrie:go_default_library", "//beacon-chain/state/state-native/custom-types:go_default_library", "//beacon-chain/state/state-native/fieldtrie:go_default_library", + "//beacon-chain/state/state-native/v1:go_default_library", "//beacon-chain/state/stateutil:go_default_library", "//beacon-chain/state/types:go_default_library", - "//beacon-chain/state/v1:go_default_library", "//config/features:go_default_library", "//config/fieldparams:go_default_library", "//config/params:go_default_library", diff --git a/beacon-chain/state/state-native/v2/beacon_state_mainnet.go b/beacon-chain/state/state-native/v2/beacon_state_mainnet.go index ee49eb460..35eda0abe 100644 --- a/beacon-chain/state/state-native/v2/beacon_state_mainnet.go +++ b/beacon-chain/state/state-native/v2/beacon_state_mainnet.go @@ -7,8 +7,8 @@ import ( eth2types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/beacon-chain/state/fieldtrie" customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/fieldtrie" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/state/state-native/v2/beacon_state_minimal.go b/beacon-chain/state/state-native/v2/beacon_state_minimal.go index 0199a607e..ee33f4c99 100644 --- a/beacon-chain/state/state-native/v2/beacon_state_minimal.go +++ b/beacon-chain/state/state-native/v2/beacon_state_minimal.go @@ -7,8 +7,8 @@ import ( eth2types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/beacon-chain/state/fieldtrie" customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/fieldtrie" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/state/state-native/v2/getters_validator.go b/beacon-chain/state/state-native/v2/getters_validator.go index f1349c7fc..4e1374f03 100644 --- a/beacon-chain/state/state-native/v2/getters_validator.go +++ b/beacon-chain/state/state-native/v2/getters_validator.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state" - v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/v1" fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" "github.com/prysmaticlabs/prysm/encoding/bytesutil" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/state/state-native/v2/state_trie.go b/beacon-chain/state/state-native/v2/state_trie.go index 7e7054200..d91e65df3 100644 --- a/beacon-chain/state/state-native/v2/state_trie.go +++ b/beacon-chain/state/state-native/v2/state_trie.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state" - "github.com/prysmaticlabs/prysm/beacon-chain/state/fieldtrie" customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/fieldtrie" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" "github.com/prysmaticlabs/prysm/config/features"