Skip to content

Commit f558c04

Browse files
high-moctaneclaude
high-moctane
and
claude
committed
refactor: テスト専用メソッドの棚卸し — unexported化・削除で公開APIを整理
- InMemoryStorage.Len() → len() に unexported化 - InMemoryStorage.DeletedLen() → 完全削除（未使用） - PebbleStorage.Len() → len() に unexported化 - BleveIndex.DocCount() → docCount() に unexported化 - CompositeStorage.Delete(), Primary(), Search() → 完全削除（未使用） 9 files changed, -30 lines 🌸 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Sakura 🌸 <noreply@anthropic.com>
1 parent bb6da15 commit f558c04

9 files changed

Lines changed: 30 additions & 61 deletions

‎bleve_index.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ func (b *BleveIndex) Close() error {
167167
return b.index.Close()
168168
}
169169

170-
// DocCount returns the number of documents in the index.
171-
// Useful for testing and monitoring.
172-
func (b *BleveIndex) DocCount() (uint64, error) {
170+
func (b *BleveIndex) docCount() (uint64, error) {
173171
return b.index.DocCount()
174172
}

‎bleve_index_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestBleveIndex_IndexAndSearch(t *testing.T) {
3535
}
3636

3737
// Verify doc count
38-
count, err := idx.DocCount()
38+
count, err := idx.docCount()
3939
if err != nil {
4040
t.Fatalf("DocCount failed: %v", err)
4141
}
@@ -160,7 +160,7 @@ func TestBleveIndex_Delete(t *testing.T) {
160160
}
161161

162162
// Verify doc count
163-
count, err := idx.DocCount()
163+
count, err := idx.docCount()
164164
if err != nil {
165165
t.Fatalf("DocCount failed: %v", err)
166166
}
@@ -183,7 +183,7 @@ func TestBleveIndex_NilEvent(t *testing.T) {
183183
t.Errorf("Index(nil) returned error: %v", err)
184184
}
185185

186-
count, _ := idx.DocCount()
186+
count, _ := idx.docCount()
187187
if count != 0 {
188188
t.Errorf("DocCount after nil index = %d, want 0", count)
189189
}

‎composite_storage.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,3 @@ func (s *CompositeStorage) Query(ctx context.Context, filters []*ReqFilter) (ite
116116
// Query primary storage with the IDs from search
117117
return s.primary.Query(ctx, []*ReqFilter{searchFilter})
118118
}
119-
120-
// Delete removes an event from both primary and search index.
121-
// This is called when processing kind 5 deletion requests.
122-
func (s *CompositeStorage) Delete(ctx context.Context, eventID string) error {
123-
if s.search != nil {
124-
_ = s.search.Delete(ctx, eventID) // Best effort
125-
}
126-
return nil // Primary handles deletion through Store (kind 5 processing)
127-
}
128-
129-
// Primary returns the underlying primary storage.
130-
// Useful for operations that don't need search.
131-
func (s *CompositeStorage) Primary() Storage {
132-
return s.primary
133-
}
134-
135-
// Search returns the underlying search index (may be nil).
136-
func (s *CompositeStorage) Search() SearchIndex {
137-
return s.search
138-
}

‎composite_storage_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func TestCompositeStorage_EphemeralNotIndexed(t *testing.T) {
221221
}
222222

223223
// Search index should be empty
224-
count, _ := search.DocCount()
224+
count, _ := search.docCount()
225225
if count != 0 {
226226
t.Errorf("Search index has %d docs, want 0 (ephemeral not indexed)", count)
227227
}

‎pebble_storage.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,7 @@ func (s *PebbleStorage) getEventByIDFromSnapshot(snapshot *pebble.Snapshot, even
769769
return &event, nil
770770
}
771771

772-
// Len returns the number of stored events.
773-
func (s *PebbleStorage) Len() int {
772+
func (s *PebbleStorage) len() int {
774773
s.mu.RLock()
775774
defer s.mu.RUnlock()
776775

‎pebble_storage_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ func TestPebbleStorage_Store_Regular(t *testing.T) {
5555
require.NoError(t, err)
5656
assert.True(t, stored)
5757

58-
assert.Equal(t, 3, s.Len())
58+
assert.Equal(t, 3, s.len())
5959

6060
// Duplicate should not be stored
6161
stored, err = s.Store(ctx, ev1)
6262
require.NoError(t, err)
6363
assert.False(t, stored)
64-
assert.Equal(t, 3, s.Len())
64+
assert.Equal(t, 3, s.len())
6565
}
6666

6767
func TestPebbleStorage_Store_Ephemeral(t *testing.T) {
@@ -74,7 +74,7 @@ func TestPebbleStorage_Store_Ephemeral(t *testing.T) {
7474
stored, err := s.Store(ctx, ev)
7575
require.NoError(t, err)
7676
assert.False(t, stored)
77-
assert.Equal(t, 0, s.Len())
77+
assert.Equal(t, 0, s.len())
7878
}
7979

8080
func TestPebbleStorage_Query_Empty(t *testing.T) {
@@ -323,19 +323,19 @@ func TestPebbleStorage_Store_Replaceable(t *testing.T) {
323323
stored, err := s.Store(ctx, ev1)
324324
require.NoError(t, err)
325325
assert.True(t, stored)
326-
assert.Equal(t, 1, s.Len())
326+
assert.Equal(t, 1, s.len())
327327

328328
// Newer replaces older
329329
stored, err = s.Store(ctx, ev2)
330330
require.NoError(t, err)
331331
assert.True(t, stored)
332-
assert.Equal(t, 1, s.Len())
332+
assert.Equal(t, 1, s.len())
333333

334334
// Older should not replace newer
335335
stored, err = s.Store(ctx, ev3)
336336
require.NoError(t, err)
337337
assert.False(t, stored)
338-
assert.Equal(t, 1, s.Len())
338+
assert.Equal(t, 1, s.len())
339339

340340
// Query should return only the newest
341341
events := queryPebble(t, s, ctx, []*ReqFilter{{}})
@@ -389,13 +389,13 @@ func TestPebbleStorage_Store_Addressable(t *testing.T) {
389389
stored, err = s.Store(ctx, ev2)
390390
require.NoError(t, err)
391391
assert.True(t, stored)
392-
assert.Equal(t, 1, s.Len())
392+
assert.Equal(t, 1, s.len())
393393

394394
// Different address -> new entry
395395
stored, err = s.Store(ctx, ev3)
396396
require.NoError(t, err)
397397
assert.True(t, stored)
398-
assert.Equal(t, 2, s.Len())
398+
assert.Equal(t, 2, s.len())
399399
}
400400

401401
func TestPebbleStorage_Store_Kind5_DeleteByEventID(t *testing.T) {
@@ -443,7 +443,7 @@ func TestPebbleStorage_Store_Kind5_PreventFutureEvent(t *testing.T) {
443443
require.NoError(t, err)
444444
assert.False(t, stored)
445445

446-
assert.Equal(t, 1, s.Len()) // Only kind 5 remains
446+
assert.Equal(t, 1, s.len()) // Only kind 5 remains
447447
}
448448

449449
func TestPebbleStorage_Store_Kind5_DifferentPubkey(t *testing.T) {
@@ -467,7 +467,7 @@ func TestPebbleStorage_Store_Kind5_DifferentPubkey(t *testing.T) {
467467
assert.True(t, stored) // The kind 5 itself is stored
468468

469469
// Both events should exist
470-
assert.Equal(t, 2, s.Len())
470+
assert.Equal(t, 2, s.len())
471471
}
472472

473473
func TestPebbleStorage_Store_Kind5_DeleteByAddress(t *testing.T) {

‎storage.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,16 +314,8 @@ func appendInt(b []byte, n int64) []byte {
314314
return append(b, digits[i:]...)
315315
}
316316

317-
// Len returns the number of stored events.
318-
func (s *InMemoryStorage) Len() int {
317+
func (s *InMemoryStorage) len() int {
319318
s.mu.RLock()
320319
defer s.mu.RUnlock()
321320
return len(s.events)
322321
}
323-
324-
// DeletedLen returns the number of deleted event IDs being tracked.
325-
func (s *InMemoryStorage) DeletedLen() int {
326-
s.mu.RLock()
327-
defer s.mu.RUnlock()
328-
return len(s.deletedIDs)
329-
}

‎storage_handler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestStorageHandler_Event_Store(t *testing.T) {
4444
}
4545

4646
// Event should be stored
47-
assert.Equal(t, 1, storage.Len())
47+
assert.Equal(t, 1, storage.len())
4848
})
4949
}
5050

@@ -81,7 +81,7 @@ func TestStorageHandler_Event_Duplicate(t *testing.T) {
8181
}
8282

8383
// Still only 1 event
84-
assert.Equal(t, 1, storage.Len())
84+
assert.Equal(t, 1, storage.len())
8585
})
8686
}
8787

‎storage_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ func TestInMemoryStorage_Store_Regular(t *testing.T) {
6161
require.NoError(t, err)
6262
assert.True(t, stored)
6363

64-
assert.Equal(t, 3, s.Len())
64+
assert.Equal(t, 3, s.len())
6565

6666
// Duplicate should not be stored
6767
stored, err = s.Store(ctx, ev1)
6868
require.NoError(t, err)
6969
assert.False(t, stored)
70-
assert.Equal(t, 3, s.Len())
70+
assert.Equal(t, 3, s.len())
7171
}
7272

7373
func TestInMemoryStorage_Store_Replaceable(t *testing.T) {
@@ -84,19 +84,19 @@ func TestInMemoryStorage_Store_Replaceable(t *testing.T) {
8484
stored, err := s.Store(ctx, ev1)
8585
require.NoError(t, err)
8686
assert.True(t, stored)
87-
assert.Equal(t, 1, s.Len())
87+
assert.Equal(t, 1, s.len())
8888

8989
// Newer replaces older
9090
stored, err = s.Store(ctx, ev2)
9191
require.NoError(t, err)
9292
assert.True(t, stored)
93-
assert.Equal(t, 1, s.Len())
93+
assert.Equal(t, 1, s.len())
9494

9595
// Older should not replace newer
9696
stored, err = s.Store(ctx, ev3)
9797
require.NoError(t, err)
9898
assert.False(t, stored)
99-
assert.Equal(t, 1, s.Len())
99+
assert.Equal(t, 1, s.len())
100100

101101
// Query should return only the newest
102102
events := queryInMemory(t, s, ctx, []*ReqFilter{{}})
@@ -144,13 +144,13 @@ func TestInMemoryStorage_Store_Addressable(t *testing.T) {
144144
stored, err = s.Store(ctx, ev2)
145145
require.NoError(t, err)
146146
assert.True(t, stored)
147-
assert.Equal(t, 1, s.Len())
147+
assert.Equal(t, 1, s.len())
148148

149149
// Different address -> new entry
150150
stored, err = s.Store(ctx, ev3)
151151
require.NoError(t, err)
152152
assert.True(t, stored)
153-
assert.Equal(t, 2, s.Len())
153+
assert.Equal(t, 2, s.len())
154154
}
155155

156156
func TestInMemoryStorage_Store_Ephemeral(t *testing.T) {
@@ -164,7 +164,7 @@ func TestInMemoryStorage_Store_Ephemeral(t *testing.T) {
164164
stored, err := s.Store(ctx, ev)
165165
require.NoError(t, err)
166166
assert.False(t, stored)
167-
assert.Equal(t, 0, s.Len())
167+
assert.Equal(t, 0, s.len())
168168
}
169169

170170
func TestInMemoryStorage_Store_Kind5_DeleteByEventID(t *testing.T) {
@@ -205,7 +205,7 @@ func TestInMemoryStorage_Store_Kind5_PreventFutureEvent(t *testing.T) {
205205
require.NoError(t, err)
206206
assert.False(t, stored)
207207

208-
assert.Equal(t, 1, s.Len()) // Only kind 5 remains
208+
assert.Equal(t, 1, s.len()) // Only kind 5 remains
209209
}
210210

211211
func TestInMemoryStorage_Store_Kind5_DifferentPubkey(t *testing.T) {
@@ -225,7 +225,7 @@ func TestInMemoryStorage_Store_Kind5_DifferentPubkey(t *testing.T) {
225225
assert.True(t, stored) // The kind 5 itself is stored
226226

227227
// Both events should exist
228-
assert.Equal(t, 2, s.Len())
228+
assert.Equal(t, 2, s.len())
229229
}
230230

231231
func TestInMemoryStorage_Store_Kind5_DeleteByAddress(t *testing.T) {
@@ -261,7 +261,7 @@ func TestInMemoryStorage_Store_Kind5_DeleteItself(t *testing.T) {
261261
assert.True(t, stored)
262262

263263
// The kind 5 should have deleted itself
264-
assert.Equal(t, 0, s.Len())
264+
assert.Equal(t, 0, s.len())
265265
}
266266

267267
func TestInMemoryStorage_Store_Kind5_DeleteKind5(t *testing.T) {

0 commit comments

Comments
 (0)