Skip to content

Adding grpc equivalent of "/v1/connection/commit/{allocation}" #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 31, 2021
Merged

Adding grpc equivalent of "/v1/connection/commit/{allocation}" #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0505a3e
:sparkles: added grpc equivalent of commit api
shravanshetty1 May 23, 2021
557240c
:white_check_mark: added unit tests
shravanshetty1 May 29, 2021
2f28181
Merge branch 'grpc' into 147-grpc-commit-method
shravanshetty1 May 30, 2021
a6c4de3
:white_check_mark: add integration tests
shravanshetty1 May 30, 2021
738191d
Merge branch 'grpc' into 147-grpc-commit-method
shravanshetty1 May 31, 2021
95a906c
missing changes from previous commit
shravanshetty1 May 31, 2021
f4ff3af
:bug: adding correct grpc gateway handler
shravanshetty1 May 31, 2021
c1a81f9
:package: updating grpc generated files
shravanshetty1 May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,271 changes: 731 additions & 540 deletions code/go/0chain.net/blobbercore/blobbergrpc/blobber.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

115 changes: 115 additions & 0 deletions code/go/0chain.net/blobbercore/blobbergrpc/blobber.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions code/go/0chain.net/blobbercore/blobbergrpc/blobber_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions code/go/0chain.net/blobbercore/blobbergrpc/proto/blobber.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ service Blobber {
};
}

rpc Commit(CommitRequest) returns (CommitResponse) {
option (google.api.http) = {
post: "/v2/connection/commit/{allocation}"
body: "*"
};
}

rpc CalculateHash(CalculateHashRequest) returns (CalculateHashResponse) {
option (google.api.http) = {
post: "/v2/file/calculatehash/{allocation}"
Expand All @@ -61,6 +68,20 @@ message CalculateHashResponse {
string message = 1;
}

message CommitRequest {
string allocation = 1;
string connection_id = 2;
string write_marker = 3;
}


message CommitResponse {
string allocation_root = 1;
WriteMarker write_marker = 2;
string error_message = 3;
bool success = 4;
}

message GetObjectTreeRequest {
string path = 1;
string allocation = 2;
Expand Down
9 changes: 9 additions & 0 deletions code/go/0chain.net/blobbercore/convert/responseHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ func GetObjectTreeResponseHandler(getObjectTreeResponse *blobbergrpc.GetObjectTr
}
}

func CommitWriteResponseHandler(resp *blobbergrpc.CommitResponse) *blobberHTTP.CommitResult {
return &blobberHTTP.CommitResult{
AllocationRoot: resp.AllocationRoot,
WriteMarker: WriteMarkerGRPCToWriteMarker(resp.WriteMarker),
Success: resp.Success,
ErrorMessage: resp.ErrorMessage,
}
}

func GetCalculateHashResponseHandler(response *blobbergrpc.CalculateHashResponse) interface{} {
result := make(map[string]interface{})
if msg := response.GetMessage(); msg != "" {
Expand Down
Loading