Move State Protos Into V2 Namespace (#9257)

* move state protos

* regen ssz

* edit v1 code

* fix imports

* building

* beacon chain builds

* validator and shared builds

* fuzz builds

* changes

* spectest builds

* tools build

* remove import cycle

* generate ssz

* pcli

* gaz

* kafka

* gaz
This commit is contained in:
Raul Jordan
2021-07-23 08:07:40 -05:00
committed by GitHub
parent 526596a679
commit 2d10bcf179
270 changed files with 1548 additions and 1542 deletions

View File

@@ -12,9 +12,9 @@ go_library(
deps = [
"//beacon-chain/core/state:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v1alpha1/wrapper:go_default_library",
"//proto/prysm/v2/state:go_default_library",
"//shared/sszutil:go_default_library",
"//shared/version:go_default_library",
"@com_github_ferranbt_fastssz//:go_default_library",

View File

@@ -13,9 +13,9 @@ import (
"github.com/kr/pretty"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
statepb "github.com/prysmaticlabs/prysm/proto/prysm/v2/state"
"github.com/prysmaticlabs/prysm/shared/sszutil"
"github.com/prysmaticlabs/prysm/shared/version"
log "github.com/sirupsen/logrus"
@@ -82,7 +82,7 @@ func main() {
case "deposit":
data = &ethpb.Deposit{}
case "deposit_message":
data = &pb.DepositMessage{}
data = &statepb.DepositMessage{}
case "proposer_slashing":
data = &ethpb.ProposerSlashing{}
case "signed_block_header":
@@ -92,7 +92,7 @@ func main() {
case "voluntary_exit":
data = &ethpb.VoluntaryExit{}
case "state":
data = &pb.BeaconState{}
data = &statepb.BeaconState{}
default:
log.Fatal("Invalid type")
}
@@ -156,7 +156,7 @@ func main() {
}
preStatePath = text
}
preState := &pb.BeaconState{}
preState := &statepb.BeaconState{}
if err := dataFetcher(preStatePath, preState); err != nil {
log.Fatal(err)
}
@@ -188,7 +188,7 @@ func main() {
// Diff the state if a post state is provided.
if expectedPostStatePath != "" {
expectedState := &pb.BeaconState{}
expectedState := &statepb.BeaconState{}
if err := dataFetcher(expectedPostStatePath, expectedState); err != nil {
log.Fatal(err)
}