Merge pull request #6197 from filecoin-project/feat/market/import-dat…

…a-by-uuid feat: import data by uuid
filecoin-project · Oct 31, 2023 · faaf3e5 · faaf3e5
1 parent a2234ee
commit faaf3e5
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 27 deletions.
diff --git a/venus-shared/api/market/v0/api.go b/venus-shared/api/market/v0/api.go
@@ -56,7 +56,7 @@ type IMarket interface {
 	PiecesGetPieceInfo(ctx context.Context, pieceCid cid.Cid) (*piecestore.PieceInfo, error) //perm:read
 	PiecesGetCIDInfo(ctx context.Context, payloadCid cid.Cid) (*piecestore.CIDInfo, error)   //perm:read
 
-	DealsImportData(ctx context.Context, dealPropCid cid.Cid, file string, skipCommP bool) error              //perm:admin
+	DealsImportData(ctx context.Context, ref market.ImportDataRef, skipCommP bool) error                      //perm:admin
 	DealsBatchImportData(ctx context.Context, refs market.ImportDataRefs) ([]*market.ImportDataResult, error) //perm:admin
 	DealsImport(ctx context.Context, deals []market.MinerDeal) error                                          //perm:admin
 

diff --git a/venus-shared/api/market/v0/method.md b/venus-shared/api/market/v0/method.md
@@ -456,6 +456,7 @@ Inputs:
         "ProposalCID": {
           "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
         },
+        "UUID": "07070707-0707-0707-0707-070707070707",
         "File": "string value"
       }
     ],
@@ -468,9 +469,7 @@ Response:
 ```json
 [
   {
-    "ProposalCID": {
-      "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
-    },
+    "Target": "string value",
     "Message": "string value"
   }
 ]
@@ -650,9 +649,12 @@ Inputs:
 ```json
 [
   {
-    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+    "ProposalCID": {
+      "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+    },
+    "UUID": "07070707-0707-0707-0707-070707070707",
+    "File": "string value"
   },
-  "string value",
   true
 ]
 ```

diff --git a/venus-shared/api/market/v0/mock/mock_imarket.go b/venus-shared/api/market/v0/mock/mock_imarket.go
diff --git a/venus-shared/api/market/v0/proxy_gen.go b/venus-shared/api/market/v0/proxy_gen.go
diff --git a/venus-shared/api/market/v1/api.go b/venus-shared/api/market/v1/api.go
@@ -56,7 +56,7 @@ type IMarket interface {
 	PiecesGetPieceInfo(ctx context.Context, pieceCid cid.Cid) (*piecestore.PieceInfo, error) //perm:read
 	PiecesGetCIDInfo(ctx context.Context, payloadCid cid.Cid) (*piecestore.CIDInfo, error)   //perm:read
 
-	DealsImportData(ctx context.Context, dealPropCid cid.Cid, file string, skipCommP bool) error              //perm:admin
+	DealsImportData(ctx context.Context, ref market.ImportDataRef, skipCommP bool) error                      //perm:admin
 	DealsBatchImportData(ctx context.Context, refs market.ImportDataRefs) ([]*market.ImportDataResult, error) //perm:admin
 	DealsImport(ctx context.Context, deals []*market.MinerDeal) error                                         //perm:admin
 

diff --git a/venus-shared/api/market/v1/method.md b/venus-shared/api/market/v1/method.md
@@ -457,6 +457,7 @@ Inputs:
         "ProposalCID": {
           "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
         },
+        "UUID": "07070707-0707-0707-0707-070707070707",
         "File": "string value"
       }
     ],
@@ -469,9 +470,7 @@ Response:
 ```json
 [
   {
-    "ProposalCID": {
-      "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
-    },
+    "Target": "string value",
     "Message": "string value"
   }
 ]
@@ -651,9 +650,12 @@ Inputs:
 ```json
 [
   {
-    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+    "ProposalCID": {
+      "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+    },
+    "UUID": "07070707-0707-0707-0707-070707070707",
+    "File": "string value"
   },
-  "string value",
   true
 ]
 ```

diff --git a/venus-shared/api/market/v1/mock/mock_imarket.go b/venus-shared/api/market/v1/mock/mock_imarket.go
diff --git a/venus-shared/api/market/v1/proxy_gen.go b/venus-shared/api/market/v1/proxy_gen.go
diff --git a/venus-shared/types/market/storage.go b/venus-shared/types/market/storage.go
@@ -133,6 +133,7 @@ type StorageDealQueryParams struct {
 
 type ImportDataRef struct {
 	ProposalCID cid.Cid
+	UUID        uuid.UUID
 	File        string
 }
 
@@ -142,7 +143,8 @@ type ImportDataRefs struct {
 }
 
 type ImportDataResult struct {
-	ProposalCID cid.Cid
+	// Target may deal proposal cid or deal uuid
+	Target string
 	// deal import failed
 	Message string
 }