fix: update failed bitswap event to failed retrieval

filecoin-project · Jun 27, 2023 · d4f9193 · d4f9193
1 parent 2879b02
commit d4f9193
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/retriever/bitswapretriever.go b/pkg/retriever/bitswapretriever.go
@@ -243,7 +243,7 @@ func (br *bitswapRetrieval) RetrieveFromAsyncCandidates(ayncCandidates types.Inb
 	br.bstore.RemoveLinkSystem(br.request.RetrievalID)
 	if err != nil {
 		// record failure
-		br.events(events.Failed(br.clock.Now(), br.request.RetrievalID, bitswapCandidate, err.Error()))
+		br.events(events.FailedRetrieval(br.clock.Now(), br.request.RetrievalID, bitswapCandidate, err.Error()))
 		return nil, err
 	}
 	duration := br.clock.Since(startTime)

diff --git a/pkg/retriever/bitswapretriever_test.go b/pkg/retriever/bitswapretriever_test.go
@@ -211,8 +211,8 @@ func TestBitswapRetriever(t *testing.T) {
 				cid2: testutil.GenerateRetrievalCandidates(t, 7),
 			},
 			expectedEvents: map[cid.Cid][]types.EventCode{
-				cid1: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedCode},
-				cid2: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedCode},
+				cid1: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedRetrievalCode},
+				cid2: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedRetrievalCode},
 			},
 			expectedErrors: map[cid.Cid]struct{}{
 				cid1: {},
@@ -232,8 +232,8 @@ func TestBitswapRetriever(t *testing.T) {
 				cid2: testutil.GenerateRetrievalCandidates(t, 7),
 			},
 			expectedEvents: map[cid.Cid][]types.EventCode{
-				cid1: {types.StartedRetrievalCode, types.FailedCode},
-				cid2: {types.StartedRetrievalCode, types.FailedCode},
+				cid1: {types.StartedRetrievalCode, types.FailedRetrievalCode},
+				cid2: {types.StartedRetrievalCode, types.FailedRetrievalCode},
 			},
 			expectedErrors: map[cid.Cid]struct{}{
 				cid1: {},
@@ -261,8 +261,8 @@ func TestBitswapRetriever(t *testing.T) {
 				cid2: testutil.GenerateRetrievalCandidates(t, 7),
 			},
 			expectedEvents: map[cid.Cid][]types.EventCode{
-				cid1: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedCode},
-				cid2: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedCode},
+				cid1: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedRetrievalCode},
+				cid2: {types.StartedRetrievalCode, types.FirstByteCode, types.FailedRetrievalCode},
 			},
 			expectedErrors: map[cid.Cid]struct{}{
 				cid1: {},