This is an automated email from the ASF dual-hosted git repository. cmorris pushed a commit to branch splitroles-blockchain in repository https://gitbox.apache.org/repos/asf/incubator-milagro-dta.git
commit b0e64b8638713f1feebb1940b49551067235ceeb Author: Christopher Morris <[email protected]> AuthorDate: Wed Oct 2 09:00:52 2019 +0100 Remove unused endpoints --- pkg/defaultservice/order.go | 3 +- pkg/endpoints/endpoints.go | 89 +-------------------------------------------- 2 files changed, 3 insertions(+), 89 deletions(-) diff --git a/pkg/defaultservice/order.go b/pkg/defaultservice/order.go index 7adfbc9..4f9c87f 100644 --- a/pkg/defaultservice/order.go +++ b/pkg/defaultservice/order.go @@ -254,5 +254,6 @@ func (s *Service) OrderSecret1(req *api.OrderSecretRequest) (string, error) { Payload: payload, Tags: map[string]string{"reference": order.Reference, "txhash": hex.EncodeToString(txHash)}, } - return tendermint.PostToChain(chainTX, "OrderSecret1") + tendermint.PostToChain(chainTX, "OrderSecret1") + return order.Reference, nil } diff --git a/pkg/endpoints/endpoints.go b/pkg/endpoints/endpoints.go index f7d053d..d972829 100644 --- a/pkg/endpoints/endpoints.go +++ b/pkg/endpoints/endpoints.go @@ -104,20 +104,6 @@ func Endpoints(svc service.Service, corsAllow string, authorizer transport.Autho transport.ErrInvalidRequest: http.StatusUnprocessableEntity, }, }, - "Order2": { - Path: "/" + apiVersion + "/order2", - Method: http.MethodPost, - Endpoint: MakeOrder2Endpoint(svc), - NewRequest: func() interface{} { return &api.FulfillOrderResponse{} }, - NewResponse: func() interface{} { return &api.OrderResponse{} }, - Options: transport.ServerOptions( - transport.SetCors(corsAllow), - transport.AuthorizeOIDC(authorizer, false), - ), - ErrStatus: transport.ErrorStatus{ - transport.ErrInvalidRequest: http.StatusUnprocessableEntity, - }, - }, "GetOrder": { Path: "/" + apiVersion + "/order/{OrderReference}", @@ -159,51 +145,8 @@ func Endpoints(svc service.Service, corsAllow string, authorizer transport.Autho transport.ErrInvalidRequest: http.StatusUnprocessableEntity, }, }, - "OrderSecret2": { - Path: "/" + apiVersion + "/order/secret2", - Method: http.MethodPost, - Endpoint: MakeOrderSecret2Endpoint(svc), - NewRequest: func() interface{} { return &api.FulfillOrderSecretResponse{} }, - NewResponse: func() interface{} { return &api.OrderSecretResponse{} }, - Options: transport.ServerOptions( - transport.SetCors(corsAllow), - transport.AuthorizeOIDC(authorizer, false), - ), - ErrStatus: transport.ErrorStatus{ - transport.ErrInvalidRequest: http.StatusUnprocessableEntity, - }, - }, - } - masterFiduciaryEndpoints := transport.HTTPEndpoints{ - "FulfillOrder": { - Path: "/" + apiVersion + "/fulfill/order", - Method: http.MethodPost, - Endpoint: MakeFulfillOrderEndpoint(svc), - NewRequest: func() interface{} { return &api.FulfillOrderRequest{} }, - NewResponse: func() interface{} { return &api.FulfillOrderResponse{} }, - Options: transport.ServerOptions( - transport.SetCors(corsAllow), - transport.AuthorizeOIDC(authorizer, false), - ), - ErrStatus: transport.ErrorStatus{ - transport.ErrInvalidRequest: http.StatusUnprocessableEntity, - }, - }, - "FulfillOrderSecret": { - Path: "/" + apiVersion + "/fulfill/order/secret", - Method: http.MethodPost, - Endpoint: MakeFulfillOrderSecretEndpoint(svc), - NewRequest: func() interface{} { return &api.FulfillOrderSecretRequest{} }, - NewResponse: func() interface{} { return &api.FulfillOrderSecretResponse{} }, - Options: transport.ServerOptions( - transport.SetCors(corsAllow), - transport.AuthorizeOIDC(authorizer, false), - ), - ErrStatus: transport.ErrorStatus{ - transport.ErrInvalidRequest: http.StatusUnprocessableEntity, - }, - }, } + masterFiduciaryEndpoints := transport.HTTPEndpoints{} statusEndPoints := transport.HTTPEndpoints{ "Status": { @@ -338,21 +281,6 @@ func MakeOrder1Endpoint(m service.Service) endpoint.Endpoint { } } -//MakeOrder2Endpoint - -func MakeOrder2Endpoint(m service.Service) endpoint.Endpoint { - // return func(ctx context.Context, request interface{}) (response interface{}, err error) { - // req, ok := request.(*api.FulfillOrderResponse) - // if !ok { - // return nil, transport.ErrInvalidRequest - // } - // if err := validateRequest(req); err != nil { - // return "", err - // } - // return m.Order2(req) - // } - return nil -} - //MakeOrderSecret1Endpoint - func MakeOrderSecret1Endpoint(m service.Service) endpoint.Endpoint { return func(ctx context.Context, request interface{}) (response interface{}, err error) { @@ -367,21 +295,6 @@ func MakeOrderSecret1Endpoint(m service.Service) endpoint.Endpoint { } } -//MakeOrderSecret2Endpoint - -func MakeOrderSecret2Endpoint(m service.Service) endpoint.Endpoint { - return nil -} - -//MakeFulfillOrderEndpoint - -func MakeFulfillOrderEndpoint(m service.Service) endpoint.Endpoint { - return nil -} - -//MakeFulfillOrderSecretEndpoint - -func MakeFulfillOrderSecretEndpoint(m service.Service) endpoint.Endpoint { - return nil -} - //MakeStatusEndpoint - func MakeStatusEndpoint(m service.Service, nodeType string) endpoint.Endpoint { return func(ctx context.Context, request interface{}) (response interface{}, err error) {
