Skip to content

634 multisig api #653

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 23 commits into from
Mar 12, 2020
Merged

634 multisig api #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
49b3710
#634 init multisig api
andy-shi88 Mar 10, 2020
f1d4079
#634 update multisig request model
andy-shi88 Mar 10, 2020
d375ee9
#634 update get pending tx detail response
andy-shi88 Mar 10, 2020
e64e660
#634 update get pending tx detail response
andy-shi88 Mar 10, 2020
a6d5a71
#634 initiate multisig client API
andy-shi88 Mar 11, 2020
39f643a
#634 fix bug: wrong empty signature checks
andy-shi88 Mar 11, 2020
d759ab0
#634 remove built binary from repository
andy-shi88 Mar 11, 2020
84c4b88
#634 add multisig api tests
andy-shi88 Mar 11, 2020
197e2b2
#634 revert unnecessary changes
andy-shi88 Mar 11, 2020
9409300
#634 update go mod
andy-shi88 Mar 11, 2020
80ee9de
#634 initiate health check service and model
andy-shi88 Mar 11, 2020
a591f39
#646 add health check endpoint
andy-shi88 Mar 11, 2020
ed31d17
#634 update schema
andy-shi88 Mar 11, 2020
2c2c9c6
#634 use getter instead of accessing field directly
andy-shi88 Mar 11, 2020
5f86076
Merge branch 'develop' into 634-multisig-api
astaphobia Mar 11, 2020
6136364
#634 add stricter param check
andy-shi88 Mar 11, 2020
ca441b9
Merge branch '634-multisig-api' of github.com:andy-shi88/zoobc-core i…
andy-shi88 Mar 11, 2020
e892362
#634 fix pagination
andy-shi88 Mar 11, 2020
2729644
#634 remove duplicate code
andy-shi88 Mar 11, 2020
803a19b
Merge branch 'develop' into 634-multisig-api
andy-shi88 Mar 11, 2020
90a3cbd
Merge branch '634-multisig-api' of github.com:andy-shi88/zoobc-core i…
andy-shi88 Mar 11, 2020
5d276d5
#634 add default field to order field param
andy-shi88 Mar 12, 2020
d7c7421
#634 fix conflicts
andy-shi88 Mar 12, 2020
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
4 changes: 4 additions & 0 deletions api/handler/multisigHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ func (msh *MultisigHandler) GetPendingTransactionByAddress(
if req.GetPagination().GetPage() < 1 {
return nil, status.Error(codes.InvalidArgument, "PageCannotBeLessThanOne")
}
if req.GetPagination().GetOrderField() == "" {
req.Pagination.OrderField = "block_height"
req.Pagination.OrderBy = model.OrderBy_DESC
}
result, err := msh.MultisigService.GetPendingTransactionByAddress(req)
return result, err
}
Expand Down
4 changes: 1 addition & 3 deletions api/service/multisigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ func (ms *MultisigService) GetPendingTransactionByAddress(
}
return nil, status.Error(codes.Internal, err.Error())
}
if param.GetPagination().GetOrderField() != "" {
caseQuery.OrderBy(param.GetPagination().GetOrderField(), param.GetPagination().GetOrderBy())
}
caseQuery.OrderBy(param.GetPagination().GetOrderField(), param.GetPagination().GetOrderBy())
caseQuery.Paginate(
param.GetPagination().GetLimit(),
param.GetPagination().GetPage(),
Expand Down