From bb835a144385a533b83c0fa2da2bd1e62fc403d1 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 8 Nov 2023 15:17:35 -0800 Subject: [PATCH] suck less at naming --- repomgr/repomgr.go | 4 ++-- util/readrecordbs.go | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/repomgr/repomgr.go b/repomgr/repomgr.go index 9461a1760..77fb5adf6 100644 --- a/repomgr/repomgr.go +++ b/repomgr/repomgr.go @@ -455,7 +455,7 @@ func (rm *RepoManager) GetRecordProof(ctx context.Context, user models.Uid, coll return cid.Undef, nil, err } - bs := util.NewReadRecordBstore(robs) + bs := util.NewLoggingBstore(robs) head, err := rm.cs.GetUserRepoHead(ctx, user) if err != nil { @@ -472,7 +472,7 @@ func (rm *RepoManager) GetRecordProof(ctx context.Context, user models.Uid, coll return cid.Undef, nil, err } - return head, bs.AllReadBlocks(), nil + return head, bs.GetLoggedBlocks(), nil } func (rm *RepoManager) GetProfile(ctx context.Context, uid models.Uid) (*bsky.ActorProfile, error) { diff --git a/util/readrecordbs.go b/util/readrecordbs.go index ee92cf159..62271ca4d 100644 --- a/util/readrecordbs.go +++ b/util/readrecordbs.go @@ -9,22 +9,22 @@ import ( blockstore "github.com/ipfs/go-ipfs-blockstore" ) -type ReadRecordBstore struct { +type LoggingBstore struct { base blockstore.Blockstore set map[cid.Cid]blockformat.Block } -func NewReadRecordBstore(base blockstore.Blockstore) *ReadRecordBstore { - return &ReadRecordBstore{ +func NewLoggingBstore(base blockstore.Blockstore) *LoggingBstore { + return &LoggingBstore{ base: base, set: make(map[cid.Cid]blockformat.Block), } } -var _ blockstore.Blockstore = (*ReadRecordBstore)(nil) +var _ blockstore.Blockstore = (*LoggingBstore)(nil) -func (bs *ReadRecordBstore) AllReadBlocks() []blockformat.Block { +func (bs *LoggingBstore) GetLoggedBlocks() []blockformat.Block { var out []blockformat.Block for _, v := range bs.set { out = append(out, v) @@ -32,11 +32,11 @@ func (bs *ReadRecordBstore) AllReadBlocks() []blockformat.Block { return out } -func (bs *ReadRecordBstore) Has(ctx context.Context, c cid.Cid) (bool, error) { +func (bs *LoggingBstore) Has(ctx context.Context, c cid.Cid) (bool, error) { return bs.base.Has(ctx, c) } -func (bs *ReadRecordBstore) Get(ctx context.Context, c cid.Cid) (blockformat.Block, error) { +func (bs *LoggingBstore) Get(ctx context.Context, c cid.Cid) (blockformat.Block, error) { blk, err := bs.base.Get(ctx, c) if err != nil { return nil, err @@ -47,26 +47,26 @@ func (bs *ReadRecordBstore) Get(ctx context.Context, c cid.Cid) (blockformat.Blo return blk, nil } -func (bs *ReadRecordBstore) GetSize(ctx context.Context, c cid.Cid) (int, error) { +func (bs *LoggingBstore) GetSize(ctx context.Context, c cid.Cid) (int, error) { return bs.base.GetSize(ctx, c) } -func (bs *ReadRecordBstore) DeleteBlock(ctx context.Context, c cid.Cid) error { +func (bs *LoggingBstore) DeleteBlock(ctx context.Context, c cid.Cid) error { return fmt.Errorf("deletes not allowed on read-record blockstore") } -func (bs *ReadRecordBstore) Put(context.Context, blockformat.Block) error { +func (bs *LoggingBstore) Put(context.Context, blockformat.Block) error { return fmt.Errorf("writes not allowed on read-record blockstore") } -func (bs *ReadRecordBstore) PutMany(context.Context, []blockformat.Block) error { +func (bs *LoggingBstore) PutMany(context.Context, []blockformat.Block) error { return fmt.Errorf("writes not allowed on read-record blockstore") } -func (bs *ReadRecordBstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { +func (bs *LoggingBstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { return nil, fmt.Errorf("iteration not supported on read-record blockstore") } -func (bs *ReadRecordBstore) HashOnRead(enabled bool) { +func (bs *LoggingBstore) HashOnRead(enabled bool) { }