Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete archival DB methods #5459

Merged
merged 9 commits into from
Apr 16, 2020
Merged

Delete archival DB methods #5459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40b6ee4
Fix ListValidatorBalances
terencechain Apr 16, 2020
a4902e4
Fixed all the tests
terencechain Apr 16, 2020
3dd6c3f
Merge refs/heads/master into fix-list-balances
prylabs-bulldozer[bot] Apr 16, 2020
8b4e3e7
Use requestedEpoch as default
terencechain Apr 16, 2020
32f9ab1
Merge branch 'fix-list-balances' of github.com:prysmaticlabs/prysm in…
terencechain Apr 16, 2020
81fa1b8
Fixed a test
terencechain Apr 16, 2020
b89a2d4
Removed archival DB usages
terencechain Apr 16, 2020
32178e6
Merge branch 'master' of github.com:prysmaticlabs/prysm into rm-archi…
terencechain Apr 16, 2020
e97a890
Merge refs/heads/master into rm-archival-dbs
prylabs-bulldozer[bot] Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions beacon-chain/db/iface/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ type ReadOnlyDatabase interface {
JustifiedCheckpoint(ctx context.Context) (*eth.Checkpoint, error)
FinalizedCheckpoint(ctx context.Context) (*eth.Checkpoint, error)
// Archival data handlers for storing/retrieving historical beacon node information.
ArchivedActiveValidatorChanges(ctx context.Context, epoch uint64) (*ethereum_beacon_p2p_v1.ArchivedActiveSetChanges, error)
ArchivedCommitteeInfo(ctx context.Context, epoch uint64) (*ethereum_beacon_p2p_v1.ArchivedCommitteeInfo, error)
ArchivedBalances(ctx context.Context, epoch uint64) ([]uint64, error)
ArchivedValidatorParticipation(ctx context.Context, epoch uint64) (*eth.ValidatorParticipation, error)
ArchivedPointRoot(ctx context.Context, index uint64) [32]byte
HasArchivedPoint(ctx context.Context, index uint64) bool
LastArchivedIndexRoot(ctx context.Context) [32]byte
Expand Down Expand Up @@ -97,10 +93,6 @@ type NoHeadAccessDatabase interface {
SaveJustifiedCheckpoint(ctx context.Context, checkpoint *eth.Checkpoint) error
SaveFinalizedCheckpoint(ctx context.Context, checkpoint *eth.Checkpoint) error
// Archival data handlers for storing/retrieving historical beacon node information.
SaveArchivedActiveValidatorChanges(ctx context.Context, epoch uint64, changes *ethereum_beacon_p2p_v1.ArchivedActiveSetChanges) error
SaveArchivedCommitteeInfo(ctx context.Context, epoch uint64, info *ethereum_beacon_p2p_v1.ArchivedCommitteeInfo) error
SaveArchivedBalances(ctx context.Context, epoch uint64, balances []uint64) error
SaveArchivedValidatorParticipation(ctx context.Context, epoch uint64, part *eth.ValidatorParticipation) error
SaveArchivedPointRoot(ctx context.Context, blockRoot [32]byte, index uint64) error
SaveLastArchivedIndex(ctx context.Context, index uint64) error
// Deposit contract related handlers.
Expand Down
41 changes: 0 additions & 41 deletions beacon-chain/db/kafka/passthrough.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
"github.com/prysmaticlabs/prysm/beacon-chain/state"
"github.com/prysmaticlabs/prysm/proto/beacon/db"
ethereum_beacon_p2p_v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
)

Expand Down Expand Up @@ -163,26 +162,6 @@ func (e Exporter) FinalizedCheckpoint(ctx context.Context) (*eth.Checkpoint, err
return e.db.FinalizedCheckpoint(ctx)
}

// ArchivedActiveValidatorChanges -- passthrough.
func (e Exporter) ArchivedActiveValidatorChanges(ctx context.Context, epoch uint64) (*ethereum_beacon_p2p_v1.ArchivedActiveSetChanges, error) {
return e.db.ArchivedActiveValidatorChanges(ctx, epoch)
}

// ArchivedCommitteeInfo -- passthrough.
func (e Exporter) ArchivedCommitteeInfo(ctx context.Context, epoch uint64) (*ethereum_beacon_p2p_v1.ArchivedCommitteeInfo, error) {
return e.db.ArchivedCommitteeInfo(ctx, epoch)
}

// ArchivedBalances -- passthrough.
func (e Exporter) ArchivedBalances(ctx context.Context, epoch uint64) ([]uint64, error) {
return e.db.ArchivedBalances(ctx, epoch)
}

// ArchivedValidatorParticipation -- passthrough.
func (e Exporter) ArchivedValidatorParticipation(ctx context.Context, epoch uint64) (*eth.ValidatorParticipation, error) {
return e.db.ArchivedValidatorParticipation(ctx, epoch)
}

// DepositContractAddress -- passthrough.
func (e Exporter) DepositContractAddress(ctx context.Context) ([]byte, error) {
return e.db.DepositContractAddress(ctx)
Expand Down Expand Up @@ -248,26 +227,6 @@ func (e Exporter) SaveFinalizedCheckpoint(ctx context.Context, checkpoint *eth.C
return e.db.SaveFinalizedCheckpoint(ctx, checkpoint)
}

// SaveArchivedActiveValidatorChanges -- passthrough.
func (e Exporter) SaveArchivedActiveValidatorChanges(ctx context.Context, epoch uint64, changes *ethereum_beacon_p2p_v1.ArchivedActiveSetChanges) error {
return e.db.SaveArchivedActiveValidatorChanges(ctx, epoch, changes)
}

// SaveArchivedCommitteeInfo -- passthrough.
func (e Exporter) SaveArchivedCommitteeInfo(ctx context.Context, epoch uint64, info *ethereum_beacon_p2p_v1.ArchivedCommitteeInfo) error {
return e.db.SaveArchivedCommitteeInfo(ctx, epoch, info)
}

// SaveArchivedBalances -- passthrough.
func (e Exporter) SaveArchivedBalances(ctx context.Context, epoch uint64, balances []uint64) error {
return e.db.SaveArchivedBalances(ctx, epoch, balances)
}

// SaveArchivedValidatorParticipation -- passthrough.
func (e Exporter) SaveArchivedValidatorParticipation(ctx context.Context, epoch uint64, part *eth.ValidatorParticipation) error {
return e.db.SaveArchivedValidatorParticipation(ctx, epoch, part)
}

// SaveDepositContractAddress -- passthrough.
func (e Exporter) SaveDepositContractAddress(ctx context.Context, addr common.Address) error {
return e.db.SaveDepositContractAddress(ctx, addr)
Expand Down
2 changes: 0 additions & 2 deletions beacon-chain/db/kv/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = [
"archive.go",
"archived_point.go",
"attestations.go",
"backup.go",
Expand Down Expand Up @@ -60,7 +59,6 @@ go_library(
go_test(
name = "go_default_test",
srcs = [
"archive_test.go",
"archived_point_test.go",
"attestations_test.go",
"backup_test.go",
Expand Down
166 changes: 0 additions & 166 deletions beacon-chain/db/kv/archive.go
View file
Open in desktop

This file was deleted.

Loading