From 31eae719b915533aa88da14ad01f70a898ab0d8d Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Tue, 17 Sep 2019 11:19:58 +0530 Subject: [PATCH] fix config (#3500) --- beacon-chain/node/node.go | 3 +-- proto/beacon/p2p/v1/messages.pb.go | 5 +++-- proto/beacon/p2p/v1/types.pb.go | 5 +++-- proto/beacon/rpc/v1/services.pb.go | 5 +++-- proto/beacon/rpc/v1_gateway/services.pb.go | 3 ++- proto/eth/v1alpha1/attestation.pb.go | 5 +++-- proto/eth/v1alpha1/beacon_block.pb.go | 5 +++-- proto/eth/v1alpha1/beacon_chain.pb.go | 5 +++-- proto/eth/v1alpha1/node.pb.go | 5 +++-- proto/eth/v1alpha1/slasher.pb.go | 3 ++- proto/eth/v1alpha1/validator.pb.go | 5 +++-- proto/sharding/p2p/v1/messages.pb.go | 3 ++- 12 files changed, 31 insertions(+), 21 deletions(-) diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index 165e11b28..e9d03f41d 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -71,6 +71,7 @@ func NewBeaconNode(ctx *cli.Context) (*BeaconNode, error) { ); err != nil { return nil, err } + featureconfig.ConfigureBeaconFeatures(ctx) registry := shared.NewServiceRegistry() beacon := &BeaconNode{ @@ -91,8 +92,6 @@ func NewBeaconNode(ctx *cli.Context) (*BeaconNode, error) { } } - featureconfig.ConfigureBeaconFeatures(ctx) - if err := beacon.startDB(ctx); err != nil { return nil, err } diff --git a/proto/beacon/p2p/v1/messages.pb.go b/proto/beacon/p2p/v1/messages.pb.go index 2a307d03d..1a5d12b96 100755 --- a/proto/beacon/p2p/v1/messages.pb.go +++ b/proto/beacon/p2p/v1/messages.pb.go @@ -5,10 +5,11 @@ package ethereum_beacon_p2p_v1 import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" io "io" math "math" + + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go index 99c22032d..b77e9294f 100755 --- a/proto/beacon/p2p/v1/types.pb.go +++ b/proto/beacon/p2p/v1/types.pb.go @@ -5,12 +5,13 @@ package ethereum_beacon_p2p_v1 import ( fmt "fmt" + io "io" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/rpc/v1/services.pb.go b/proto/beacon/rpc/v1/services.pb.go index 7d2b5e351..765604a1f 100755 --- a/proto/beacon/rpc/v1/services.pb.go +++ b/proto/beacon/rpc/v1/services.pb.go @@ -7,14 +7,15 @@ import ( context "context" encoding_binary "encoding/binary" fmt "fmt" + io "io" + math "math" + proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/rpc/v1_gateway/services.pb.go b/proto/beacon/rpc/v1_gateway/services.pb.go index 03c8de8c5..a69750a71 100755 --- a/proto/beacon/rpc/v1_gateway/services.pb.go +++ b/proto/beacon/rpc/v1_gateway/services.pb.go @@ -6,13 +6,14 @@ package ethereum_beacon_rpc_v1 import ( context "context" fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/attestation.pb.go b/proto/eth/v1alpha1/attestation.pb.go index b1dd5518a..223405f1e 100755 --- a/proto/eth/v1alpha1/attestation.pb.go +++ b/proto/eth/v1alpha1/attestation.pb.go @@ -5,11 +5,12 @@ package eth import ( fmt "fmt" + io "io" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/beacon_block.pb.go b/proto/eth/v1alpha1/beacon_block.pb.go index d3c2ce189..fe053f245 100755 --- a/proto/eth/v1alpha1/beacon_block.pb.go +++ b/proto/eth/v1alpha1/beacon_block.pb.go @@ -5,10 +5,11 @@ package eth import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" io "io" math "math" + + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/beacon_chain.pb.go b/proto/eth/v1alpha1/beacon_chain.pb.go index c47eb69ce..f3744ac1d 100755 --- a/proto/eth/v1alpha1/beacon_chain.pb.go +++ b/proto/eth/v1alpha1/beacon_chain.pb.go @@ -7,13 +7,14 @@ import ( context "context" encoding_binary "encoding/binary" fmt "fmt" + io "io" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/node.pb.go b/proto/eth/v1alpha1/node.pb.go index 2ba95ac9b..647805e30 100755 --- a/proto/eth/v1alpha1/node.pb.go +++ b/proto/eth/v1alpha1/node.pb.go @@ -6,12 +6,13 @@ package eth import ( context "context" fmt "fmt" + io "io" + math "math" + proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/slasher.pb.go b/proto/eth/v1alpha1/slasher.pb.go index b3c643713..e5c5d821e 100755 --- a/proto/eth/v1alpha1/slasher.pb.go +++ b/proto/eth/v1alpha1/slasher.pb.go @@ -6,10 +6,11 @@ package eth import ( context "context" fmt "fmt" + math "math" + proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/eth/v1alpha1/validator.pb.go b/proto/eth/v1alpha1/validator.pb.go index abc549b86..1ed6f5045 100755 --- a/proto/eth/v1alpha1/validator.pb.go +++ b/proto/eth/v1alpha1/validator.pb.go @@ -6,13 +6,14 @@ package eth import ( context "context" fmt "fmt" + io "io" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/sharding/p2p/v1/messages.pb.go b/proto/sharding/p2p/v1/messages.pb.go index ba268c5f4..61228b93d 100644 --- a/proto/sharding/p2p/v1/messages.pb.go +++ b/proto/sharding/p2p/v1/messages.pb.go @@ -5,9 +5,10 @@ package ethereum_sharding_p2p_v1 import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" io "io" math "math" + + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used.