diff options
| author |  Runxi Yu | 2026-03-30 18:18:06 +0000 |
|---|---|---|
| committer | Runxi Yu | 2026-03-30 18:18:06 +0000 |
| commit | 3ba67c27db0cf52b120e4f15c09047aa96d3bcb4 (patch) | |
| tree | cbd94566f5c9d2732f8527e88815e3b63413a694 /object/store/dual | |
| parent | object/store/dual: Dual shouldn't satisfy {Object,Pack}Quarantiner at all (diff) | |
| signature | No signature | |
object/store: Unify writers and fix naming v0.1.160
Diffstat (limited to 'object/store/dual')
| -rw-r--r-- | object/store/dual/dual.go | 7 | ||||
| -rw-r--r-- | object/store/dual/dual_test.go | 6 | ||||
| -rw-r--r-- | object/store/dual/quarantine.go | 2 | ||||
| -rw-r--r-- | object/store/dual/quarantine_begin.go | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/object/store/dual/dual.go b/object/store/dual/dual.go index 81dc57d7..3072ae77 100644 --- a/object/store/dual/dual.go +++ b/object/store/dual/dual.go @@ -27,8 +27,7 @@ type Dual struct { } var ( - _ objectstore.Reader = (*Dual)(nil) - _ objectstore.ObjectWriter = (*Dual)(nil) - _ objectstore.PackWriter = (*Dual)(nil) - _ objectstore.WriterQuarantiner = (*Dual)(nil) + _ objectstore.Reader = (*Dual)(nil) + _ objectstore.Writer = (*Dual)(nil) + _ objectstore.Quarantiner = (*Dual)(nil) ) diff --git a/object/store/dual/dual_test.go b/object/store/dual/dual_test.go index d9401c30..9e102734 100644 --- a/object/store/dual/dual_test.go +++ b/object/store/dual/dual_test.go @@ -117,9 +117,9 @@ func TestDualReadsWritesAndQuarantine(t *testing.T) { repo := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true}) store := newDualStore(t, repo, algo) - quarantiner, ok := any(store).(objectstore.WriterQuarantiner) + quarantiner, ok := any(store).(objectstore.Quarantiner) if !ok { - t.Fatal("dual does not implement WriterQuarantiner") + t.Fatal("dual does not implement Quarantiner") } quarantine, err := quarantiner.BeginQuarantine(objectstore.QuarantineOptions{}) @@ -219,7 +219,7 @@ func TestDualQuarantineDiscardDropsBothHalves(t *testing.T) { repo := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true}) store := newDualStore(t, repo, algo) - quarantiner := any(store).(objectstore.WriterQuarantiner) + quarantiner := any(store).(objectstore.Quarantiner) quarantine, err := quarantiner.BeginQuarantine(objectstore.QuarantineOptions{}) if err != nil { t.Fatalf("BeginQuarantine: %v", err) diff --git a/object/store/dual/quarantine.go b/object/store/dual/quarantine.go index 6fabd590..fb1048af 100644 --- a/object/store/dual/quarantine.go +++ b/object/store/dual/quarantine.go @@ -19,7 +19,7 @@ type quarantine struct { var ( _ objectstore.ObjectQuarantine = (*quarantine)(nil) _ objectstore.PackQuarantine = (*quarantine)(nil) - _ objectstore.WriterQuarantine = (*quarantine)(nil) + _ objectstore.Quarantine = (*quarantine)(nil) ) func newQuarantine( diff --git a/object/store/dual/quarantine_begin.go b/object/store/dual/quarantine_begin.go index 143bd57d..5c6bc934 100644 --- a/object/store/dual/quarantine_begin.go +++ b/object/store/dual/quarantine_begin.go @@ -5,7 +5,7 @@ import objectstore "codeberg.org/lindenii/furgit/object/store" // BeginQuarantine creates one coordinated dual quarantine spanning both stores. // // Labels: Deps-Borrowed, Life-Parent, Close-No. -func (dual *Dual) BeginQuarantine(opts objectstore.QuarantineOptions) (objectstore.WriterQuarantine, error) { +func (dual *Dual) BeginQuarantine(opts objectstore.QuarantineOptions) (objectstore.Quarantine, error) { objectQ, err := dual.object.BeginObjectQuarantine(opts.Object) if err != nil { return nil, err |