zoobc/zoobc-core#603 fix conflicts

Author: andy-shi88

documentation.swagger.json

@@ -286,6 +286,30 @@
         }
       }
     },
+    "/v1/escrow/GetEscrowTransactionRequest": {
+      "get": {
+        "tags": [
+          "EscrowTransactionService"
+        ],
+        "operationId": "GetEscrowTransaction",
+        "parameters": [
+          {
+            "type": "string",
+            "format": "int64",
+            "name": "ID",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/modelEscrow"
+            }
+          }
+        }
+      }
+    },
     "/v1/escrow/GetEscrowTransactionsRequest": {
       "post": {
         "tags": [
@@ -302,6 +326,33 @@
         }
       }
     },
+    "/v1/file/FileDownload": {
+      "get": {
+        "tags": [
+          "FileDownloadService"
+        ],
+        "operationId": "FileDownload",
+        "parameters": [
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "name": "FileChunkNames",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/modelFileDownloadResponse"
+            }
+          }
+        }
+      }
+    },
     "/v1/host/GetHostInfo": {
       "get": {
         "tags": [
@@ -1111,6 +1162,24 @@
         "EventApprovalEscrowTransaction"
       ]
     },
+    "modelFileDownloadResponse": {
+      "type": "object",
+      "properties": {
+        "Failed": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "FileChunks": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "byte"
+          }
+        }
+      }
+    },
     "modelGenerateNodeKeyResponse": {
       "type": "object",
       "properties": {

model/escrow.proto

@@ -46,4 +46,9 @@ message GetEscrowTransactionsResponse {
     uint64 Total = 1 [ jstype = JS_STRING ];
     // Transaction transactions returned
     repeated Escrow Escrows = 2;
+}
+
+// GetEscrowTransactionRequest represents GetEscrowTransaction parameter
+message GetEscrowTransactionRequest {
+    int64 ID = 1 [jstype = JS_STRING];
 }

model/fileDownload.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package model;
+option go_package = "github.com/zoobc/zoobc-core/common/model";
+
+message FileDownloadResponse {
+    repeated bytes FileChunks = 1;
+    repeated string Failed = 2;
+}
+
+// RequestFilesRequest a model request of requesting files to download from a peer 
+message FileDownloadRequest {
+    repeated string FileChunkNames = 1;
+}
+

model/signature.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package model;
+option go_package = "github.com/zoobc/zoobc-core/common/model";
+
+enum SignatureType {
+    // in bytes: []byte{0,0,0,0}, using Ed25519 signature algorithm 
+    DefaultSignature = 0;
+    // in bytes: []byte{1,0,0,0}, bitcoin uses a specific Koblitz curve secp256k1
+    // Koblitz curves are a type of Elliptic Curve Digital Signature Algorithm
+    BitcoinSignature = 1;
+}

service/escrow.proto

@@ -12,4 +12,9 @@ service EscrowTransactionService {
             post: "/v1/escrow/GetEscrowTransactionsRequest"
         };
     }
+    rpc GetEscrowTransaction(model.GetEscrowTransactionRequest) returns (model.Escrow) {
+        option(google.api.http) = {
+            get: "/v1/escrow/GetEscrowTransactionRequest"
+        };
+    }
 }

service/fileDownload.proto

@@ -0,0 +1,17 @@
+syntax="proto3";
+
+package service;
+
+option go_package = "github.com/zoobc/zoobc-core/common/service";
+
+import "model/fileDownload.proto";
+import "google/api/annotations.proto";
+
+// FileDownloadService represent request on db Transaction
+service FileDownloadService {
+    rpc FileDownload(model.FileDownloadRequest) returns (model.FileDownloadResponse) {
+        option (google.api.http) = {
+            get: "/v1/file/FileDownload"
+        };
+    }
+}

service/p2pCommunication.proto

@@ -1,4 +1,4 @@
-syntax="proto3";
+syntax = "proto3";
 
 package service;
 
@@ -10,18 +10,28 @@ import "model/empty.proto";
 import "model/block.proto";
 import "model/blockchain.proto";
 import "model/transaction.proto";
+import "model/fileDownload.proto";
 
 service P2PCommunication {
-    rpc GetPeerInfo(model.GetPeerInfoRequest) returns (model.Node) {}
-    rpc GetMorePeers(model.Empty) returns (model.GetMorePeersResponse) {}
-    rpc SendPeers(model.SendPeersRequest) returns (model.Empty) {}
-    rpc SendBlock (model.SendBlockRequest) returns (model.SendBlockResponse) {}
-    rpc SendTransaction (model.SendTransactionRequest) returns (model.SendTransactionResponse) {}
-    rpc SendBlockTransactions (model.SendBlockTransactionsRequest) returns (model.SendBlockTransactionsResponse) {}
-    rpc RequestBlockTransactions (model.RequestBlockTransactionsRequest) returns (model.Empty){}
+  rpc GetPeerInfo(model.GetPeerInfoRequest) returns (model.Node) {}
+  rpc GetMorePeers(model.Empty) returns (model.GetMorePeersResponse) {}
+  rpc SendPeers(model.SendPeersRequest) returns (model.Empty) {}
+  rpc SendBlock(model.SendBlockRequest) returns (model.SendBlockResponse) {}
+  rpc SendTransaction(model.SendTransactionRequest)
+      returns (model.SendTransactionResponse) {}
+  rpc SendBlockTransactions(model.SendBlockTransactionsRequest)
+      returns (model.SendBlockTransactionsResponse) {}
+  rpc RequestBlockTransactions(model.RequestBlockTransactionsRequest)
+      returns (model.Empty) {}
 
-    rpc GetCumulativeDifficulty(model.GetCumulativeDifficultyRequest) returns (model.GetCumulativeDifficultyResponse){}
-    rpc GetCommonMilestoneBlockIDs(model.GetCommonMilestoneBlockIdsRequest) returns (model.GetCommonMilestoneBlockIdsResponse) {}
-    rpc GetNextBlockIDs(model.GetNextBlockIdsRequest) returns (model.BlockIdsResponse) {}
-    rpc GetNextBlocks(model.GetNextBlocksRequest) returns (model.BlocksData) {}
+  rpc GetCumulativeDifficulty(model.GetCumulativeDifficultyRequest)
+      returns (model.GetCumulativeDifficultyResponse) {}
+  rpc GetCommonMilestoneBlockIDs(model.GetCommonMilestoneBlockIdsRequest)
+      returns (model.GetCommonMilestoneBlockIdsResponse) {}
+  rpc GetNextBlockIDs(model.GetNextBlockIdsRequest)
+      returns (model.BlockIdsResponse) {}
+  rpc GetNextBlocks(model.GetNextBlocksRequest) returns (model.BlocksData) {}
+
+  rpc RequestFileDownload(model.FileDownloadRequest)
+      returns (model.FileDownloadResponse) {}
 }