From e492343ffdba147f7e572d4122afe3f6df9f8653 Mon Sep 17 00:00:00 2001 From: rkapka Date: Wed, 5 Aug 2020 13:59:46 +0200 Subject: [PATCH] Code quality issues - Remove unused code (#6864) * remove unused code * gofmt * remove junk file * bring back metrics-related functions * bring back keymanager's code --- beacon-chain/blockchain/service.go | 2 -- beacon-chain/db/kv/kv.go | 3 -- beacon-chain/db/kv/schema.go | 2 -- beacon-chain/interop-cold-start/service.go | 1 - beacon-chain/p2p/metaData | Bin 0 -> 10 bytes beacon-chain/state/getters.go | 13 -------- beacon-chain/state/stategen/errors.go | 1 - beacon-chain/state/stategen/replay.go | 28 ------------------ beacon-chain/sync/rpc_goodbye.go | 5 ---- .../sync/subscriber_beacon_attestation.go | 4 --- fuzz/rpc_status_fuzz.go | 2 -- shared/aggregation/aggregation.go | 2 +- .../aggregation/attestations/attestations.go | 2 +- slasher/db/kv/kv.go | 3 -- .../detection/attestations/mock_spanner.go | 7 +---- validator/db/kv/db.go | 3 -- 16 files changed, 3 insertions(+), 75 deletions(-) create mode 100644 beacon-chain/p2p/metaData diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 6094d7c40d..adfb381233 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -63,10 +63,8 @@ type Service struct { finalizedCheckpt *ethpb.Checkpoint prevFinalizedCheckpt *ethpb.Checkpoint nextEpochBoundarySlot uint64 - voteLock sync.RWMutex initSyncState map[[32]byte]*stateTrie.BeaconState boundaryRoots [][32]byte - initSyncStateLock sync.RWMutex checkpointState *cache.CheckpointStateCache checkpointStateLock sync.Mutex stateGen *stategen.State diff --git a/beacon-chain/db/kv/kv.go b/beacon-chain/db/kv/kv.go index 2c8a116367..c6143706c2 100644 --- a/beacon-chain/db/kv/kv.go +++ b/beacon-chain/db/kv/kv.go @@ -5,7 +5,6 @@ package kv import ( "os" "path" - "sync" "time" "github.com/dgraph-io/ristretto" @@ -40,8 +39,6 @@ type Store struct { databasePath string blockCache *ristretto.Cache validatorIndexCache *ristretto.Cache - stateSlotBitLock sync.Mutex - blockSlotBitLock sync.Mutex stateSummaryCache *cache.StateSummaryCache } diff --git a/beacon-chain/db/kv/schema.go b/beacon-chain/db/kv/schema.go index 2e049b2ee7..b6b88320ee 100644 --- a/beacon-chain/db/kv/schema.go +++ b/beacon-chain/db/kv/schema.go @@ -46,8 +46,6 @@ var ( lastArchivedIndexKey = []byte("last-archived") // Deprecated: This index key was migrated in PR 6461. Do not use, except for migrations. savedStateSlotsKey = []byte("saved-state-slots") - // Deprecated: This index key was migrated in PR 6461. Do not use, except for migrations. - savedBlockSlotsKey = []byte("saved-block-slots") // New state management service compatibility bucket. newStateServiceCompatibleBucket = []byte("new-state-compatible") diff --git a/beacon-chain/interop-cold-start/service.go b/beacon-chain/interop-cold-start/service.go index a24eca2187..5d44eca125 100644 --- a/beacon-chain/interop-cold-start/service.go +++ b/beacon-chain/interop-cold-start/service.go @@ -35,7 +35,6 @@ type Service struct { genesisTime uint64 numValidators uint64 beaconDB db.HeadAccessDatabase - powchain powchain.Service depositCache *depositcache.DepositCache genesisPath string chainStartDeposits []*ethpb.Deposit diff --git a/beacon-chain/p2p/metaData b/beacon-chain/p2p/metaData new file mode 100644 index 0000000000000000000000000000000000000000..30af5db892545fef1503c68e5dbb6d22f43899d8 GIT binary patch literal 10 LcmWgQV1NPu0R{jY literal 0 HcmV?d00001 diff --git a/beacon-chain/state/getters.go b/beacon-chain/state/getters.go index 70908949bc..cbec29eebc 100644 --- a/beacon-chain/state/getters.go +++ b/beacon-chain/state/getters.go @@ -1073,19 +1073,6 @@ func (b *BeaconState) FinalizedCheckpointEpoch() uint64 { return b.state.FinalizedCheckpoint.Epoch } -// finalizedCheckpointEpoch returns the epoch value of the finalized checkpoint. -// This assumes that a lock is already held on BeaconState. -func (b *BeaconState) finalizedCheckpointEpoch() uint64 { - if !b.HasInnerState() { - return 0 - } - if b.state.FinalizedCheckpoint == nil { - return 0 - } - - return b.state.FinalizedCheckpoint.Epoch -} - func (b *BeaconState) safeCopy2DByteSlice(input [][]byte) [][]byte { if input == nil { return nil diff --git a/beacon-chain/state/stategen/errors.go b/beacon-chain/state/stategen/errors.go index 2b833a13f3..834cf2f3be 100644 --- a/beacon-chain/state/stategen/errors.go +++ b/beacon-chain/state/stategen/errors.go @@ -3,7 +3,6 @@ package stategen import "errors" var errUnknownStateSummary = errors.New("unknown state summary") -var errUnknownArchivedState = errors.New("unknown archived state") var errUnknownBoundaryState = errors.New("unknown boundary state") var errUnknownState = errors.New("unknown state") var errUnknownBlock = errors.New("unknown block") diff --git a/beacon-chain/state/stategen/replay.go b/beacon-chain/state/stategen/replay.go index ef646e4450..ec26abf683 100644 --- a/beacon-chain/state/stategen/replay.go +++ b/beacon-chain/state/stategen/replay.go @@ -318,34 +318,6 @@ func (s *State) archivedState(ctx context.Context, slot uint64) (*state.BeaconSt return st, err } -// This recomputes a state given the block root. -func (s *State) recoverStateByRoot(ctx context.Context, root [32]byte) (*state.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "stateGen.recoverStateByRoot") - defer span.End() - - lastAncestorState, err := s.lastAncestorState(ctx, root) - if err != nil { - return nil, err - } - if lastAncestorState == nil { - return nil, errUnknownState - } - - targetBlk, err := s.beaconDB.Block(ctx, root) - if err != nil { - return nil, err - } - if targetBlk == nil { - return nil, errUnknownBlock - } - blks, err := s.LoadBlocks(ctx, lastAncestorState.Slot()+1, targetBlk.Block.Slot, root) - if err != nil { - return nil, errors.Wrap(err, "could not load blocks for cold state using root") - } - - return s.ReplayBlocks(ctx, lastAncestorState, blks, targetBlk.Block.Slot) -} - // This processes a state up to input slot. func (s *State) processStateUpTo(ctx context.Context, state *state.BeaconState, slot uint64) (*state.BeaconState, error) { ctx, span := trace.StartSpan(ctx, "stateGen.processStateUpTo") diff --git a/beacon-chain/sync/rpc_goodbye.go b/beacon-chain/sync/rpc_goodbye.go index ae3f98811a..291f2fb5cf 100644 --- a/beacon-chain/sync/rpc_goodbye.go +++ b/beacon-chain/sync/rpc_goodbye.go @@ -85,11 +85,6 @@ func (s *Service) sendGoodByeMessage(ctx context.Context, code uint64, id peer.I return nil } -// sends a goodbye message for a generic error -func (s *Service) sendGenericGoodbyeMessage(ctx context.Context, id peer.ID) error { - return s.sendGoodByeMessage(ctx, codeGenericError, id) -} - func goodbyeMessage(num uint64) string { reason, ok := goodByes[num] if ok { diff --git a/beacon-chain/sync/subscriber_beacon_attestation.go b/beacon-chain/sync/subscriber_beacon_attestation.go index 98341f7c9f..9436d92475 100644 --- a/beacon-chain/sync/subscriber_beacon_attestation.go +++ b/beacon-chain/sync/subscriber_beacon_attestation.go @@ -46,10 +46,6 @@ func (s *Service) committeeIndexBeaconAttestationSubscriber(ctx context.Context, return s.attPool.SaveUnaggregatedAttestation(a) } -func (s *Service) subnetCount() int { - return int(params.BeaconNetworkConfig().AttestationSubnetCount) -} - func (s *Service) persistentSubnetIndices() []uint64 { return cache.SubnetIDs.GetAllSubnets() } diff --git a/fuzz/rpc_status_fuzz.go b/fuzz/rpc_status_fuzz.go index 1444f90826..e2d96f44e9 100644 --- a/fuzz/rpc_status_fuzz.go +++ b/fuzz/rpc_status_fuzz.go @@ -6,7 +6,6 @@ import ( "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" @@ -20,7 +19,6 @@ import ( ) var p *p2p.Service -var s network.Stream var h host.Host func init() { diff --git a/shared/aggregation/aggregation.go b/shared/aggregation/aggregation.go index 2c4c729b64..29f68578f7 100644 --- a/shared/aggregation/aggregation.go +++ b/shared/aggregation/aggregation.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" ) -var log = logrus.WithField("prefix", "aggregation") +var _ = logrus.WithField("prefix", "aggregation") var ( // ErrBitsOverlap is returned when two bitlists overlap with each other. diff --git a/shared/aggregation/attestations/attestations.go b/shared/aggregation/attestations/attestations.go index 9402e532b7..82e166b6b3 100644 --- a/shared/aggregation/attestations/attestations.go +++ b/shared/aggregation/attestations/attestations.go @@ -30,7 +30,7 @@ type attList []*ethpb.Attestation var aggregateSignatures = bls.AggregateSignatures var signatureFromBytes = bls.SignatureFromBytes -var log = logrus.WithField("prefix", "aggregation.attestations") +var _ = logrus.WithField("prefix", "aggregation.attestations") // ErrInvalidAttestationCount is returned when insufficient number // of attestations is provided for aggregation. diff --git a/slasher/db/kv/kv.go b/slasher/db/kv/kv.go index 7ab89baa50..9cc1a45e0a 100644 --- a/slasher/db/kv/kv.go +++ b/slasher/db/kv/kv.go @@ -54,9 +54,6 @@ func (db *Store) ClearSpanCache() { func (db *Store) update(fn func(*bolt.Tx) error) error { return db.db.Update(fn) } -func (db *Store) batch(fn func(*bolt.Tx) error) error { - return db.db.Batch(fn) -} func (db *Store) view(fn func(*bolt.Tx) error) error { return db.db.View(fn) } diff --git a/slasher/detection/attestations/mock_spanner.go b/slasher/detection/attestations/mock_spanner.go index a24284631b..922ee9271a 100644 --- a/slasher/detection/attestations/mock_spanner.go +++ b/slasher/detection/attestations/mock_spanner.go @@ -2,7 +2,6 @@ package attestations import ( "context" - "sync" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/slasher/detection/attestations/iface" @@ -14,11 +13,7 @@ var _ = iface.SpanDetector(&MockSpanDetector{}) // MockSpanDetector defines a struct which can detect slashable // attestation offenses by tracking validator min-max // spans from validators. -type MockSpanDetector struct { - // Slice of epochs for valindex => min-max span. - spans []map[uint64]types.Span - lock sync.RWMutex -} +type MockSpanDetector struct{} // DetectSlashingsForAttestation mocks a detected slashing, if the sent attestation data // has a source epoch of 0, nothing will be detected. If the sent attestation data has a target diff --git a/validator/db/kv/db.go b/validator/db/kv/db.go index 83d27b69e3..16aa3ac6fa 100644 --- a/validator/db/kv/db.go +++ b/validator/db/kv/db.go @@ -27,9 +27,6 @@ func (store *Store) Close() error { func (store *Store) update(fn func(*bolt.Tx) error) error { return store.db.Update(fn) } -func (store *Store) batch(fn func(*bolt.Tx) error) error { - return store.db.Batch(fn) -} func (store *Store) view(fn func(*bolt.Tx) error) error { return store.db.View(fn) }