From bab11492adae90644d6b9ed2f1d440ed705fb449 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 3 Apr 2023 16:53:55 +0300 Subject: [PATCH] [#203] node: Resolve never used errors Signed-off-by: Dmitrii Stepanov --- pkg/local_object_storage/metabase/delete_test.go | 9 +++++++-- pkg/local_object_storage/metabase/exists_test.go | 1 + pkg/local_object_storage/pilorama/forest_test.go | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/local_object_storage/metabase/delete_test.go b/pkg/local_object_storage/metabase/delete_test.go index eae8b1c66..ee161a881 100644 --- a/pkg/local_object_storage/metabase/delete_test.go +++ b/pkg/local_object_storage/metabase/delete_test.go @@ -50,6 +50,11 @@ func TestDB_Delete(t *testing.T) { err = metaInhume(db, object.AddressOf(child), object.AddressOf(ts)) require.NoError(t, err) + ts = testutil.GenerateObjectWithCID(cnr) + + err = metaInhume(db, object.AddressOf(parent), object.AddressOf(ts)) + require.NoError(t, err) + // delete object err = metaDelete(db, object.AddressOf(child)) require.NoError(t, err) @@ -62,11 +67,11 @@ func TestDB_Delete(t *testing.T) { // check if they marked as already removed ok, err := metaExists(db, object.AddressOf(child)) - require.Error(t, apistatus.ObjectAlreadyRemoved{}) + require.ErrorAs(t, err, &apistatus.ObjectAlreadyRemoved{}) require.False(t, ok) ok, err = metaExists(db, object.AddressOf(parent)) - require.Error(t, apistatus.ObjectAlreadyRemoved{}) + require.ErrorAs(t, err, &apistatus.ObjectAlreadyRemoved{}) require.False(t, ok) } diff --git a/pkg/local_object_storage/metabase/exists_test.go b/pkg/local_object_storage/metabase/exists_test.go index 66f8c2bb3..e344e9ee8 100644 --- a/pkg/local_object_storage/metabase/exists_test.go +++ b/pkg/local_object_storage/metabase/exists_test.go @@ -181,6 +181,7 @@ func TestDB_Exists(t *testing.T) { require.ErrorIs(t, err, meta.ErrObjectIsExpired) gotObj, err = metaExists(db, object.AddressOf(nonExp)) + require.NoError(t, err) require.True(t, gotObj) }) }) diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go index 8e6f12717..ebf801ef9 100644 --- a/pkg/local_object_storage/pilorama/forest_test.go +++ b/pkg/local_object_storage/pilorama/forest_test.go @@ -225,6 +225,7 @@ func testForestTreeDrop(t *testing.T, s Forest) { } } list, err := s.TreeList(cid) + require.NoError(t, err) require.NotEmpty(t, list) require.NoError(t, s.TreeDrop(cid, ""))