From 8b34137931cff1e6cdffeaf65e1ef07eefdea647 Mon Sep 17 00:00:00 2001 From: rkapka Date: Thu, 8 Oct 2020 13:40:56 +0200 Subject: [PATCH] slasher --- slasher/db/kv/block_header.go | 4 ++-- slasher/db/kv/indexed_attestations.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/slasher/db/kv/block_header.go b/slasher/db/kv/block_header.go index f841e69a17..f7efb2a0b9 100644 --- a/slasher/db/kv/block_header.go +++ b/slasher/db/kv/block_header.go @@ -116,11 +116,11 @@ func (db *Store) DeleteBlockHeader(ctx context.Context, blockHeader *ethpb.Signe func (db *Store) PruneBlockHistory(ctx context.Context, currentEpoch uint64, pruningEpochAge uint64) error { ctx, span := trace.StartSpan(ctx, "slasherDB.pruneBlockHistory") defer span.End() - pruneTill := int64(currentEpoch) - int64(pruningEpochAge) + pruneTill := currentEpoch - pruningEpochAge if pruneTill <= 0 { return nil } - pruneTillSlot := uint64(pruneTill) * params.BeaconConfig().SlotsPerEpoch + pruneTillSlot := pruneTill * params.BeaconConfig().SlotsPerEpoch return db.update(func(tx *bolt.Tx) error { bucket := tx.Bucket(historicBlockHeadersBucket) c := tx.Bucket(historicBlockHeadersBucket).Cursor() diff --git a/slasher/db/kv/indexed_attestations.go b/slasher/db/kv/indexed_attestations.go index 670a0bd423..bd99a213dd 100644 --- a/slasher/db/kv/indexed_attestations.go +++ b/slasher/db/kv/indexed_attestations.go @@ -165,7 +165,7 @@ func (db *Store) DeleteIndexedAttestation(ctx context.Context, idxAttestation *e func (db *Store) PruneAttHistory(ctx context.Context, currentEpoch uint64, pruningEpochAge uint64) error { ctx, span := trace.StartSpan(ctx, "slasherDB.pruneAttHistory") defer span.End() - pruneFromEpoch := int64(currentEpoch) - int64(pruningEpochAge) + pruneFromEpoch := currentEpoch - pruningEpochAge if pruneFromEpoch <= 0 { return nil } @@ -173,7 +173,7 @@ func (db *Store) PruneAttHistory(ctx context.Context, currentEpoch uint64, pruni return db.update(func(tx *bolt.Tx) error { attBucket := tx.Bucket(historicIndexedAttestationsBucket) c := tx.Bucket(historicIndexedAttestationsBucket).Cursor() - max := bytesutil.Bytes8(uint64(pruneFromEpoch)) + max := bytesutil.Bytes8(pruneFromEpoch) for k, _ := c.First(); k != nil && bytes.Compare(k[:8], max) <= 0; k, _ = c.Next() { if err := attBucket.Delete(k); err != nil { return errors.Wrap(err, "failed to delete indexed attestation from historical bucket")