Skip to content

Commit

Permalink
Add backward compatibility with old version of tdex-protobuf (#585)
Browse files Browse the repository at this point in the history 
* Fix handler name

* Register handler for olf version of tdex-protobuf

* Update permissions
  • Loading branch information
@altafan
altafan authored Apr 8, 2022
1 parent afd1e97 commit 62369a0
Show file tree
Hide file tree
Showing 7 changed files with 443 additions and 33 deletions.
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ require (
github.com/tdex-network/tdex-daemon/pkg/explorer v0.0.0-20211001103242-a11e4485705a
github.com/tdex-network/tdex-daemon/pkg/macaroons v0.0.0-20210813140257-70d50a8b72a4
github.com/tdex-network/tdex-daemon/pkg/securestore v0.0.0-20210813140257-70d50a8b72a4
github.com/tdex-network/tdex-protobuf v0.0.0-20220310134014-ac3f6ebd7d36
github.com/thanhpk/randstr v1.0.4
github.com/timshannon/badgerhold/v2 v2.0.0-20201016201833-94bc303c76d4
github.com/urfave/cli/v2 v2.3.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tdex-network/tdex-daemon v0.2.1-0.20210324163246-ed408aba2ec6/go.mod h1:+z4oJgZunJkfsjvcULRIT43RNTcm+2zsglU8p9JtwI8=
github.com/tdex-network/tdex-protobuf v0.0.0-20210322132201-a185bdfeb24f/go.mod h1:tVWv01BSMH/neJOsixdDFU5T0ll0OZbPliLXBsYQjA8=
github.com/tdex-network/tdex-protobuf v0.0.0-20220310134014-ac3f6ebd7d36 h1:PgWPOAMLGK2IGrWxdTwJ5TNwiLCz4sDj5vdOTgGLSPU=
github.com/tdex-network/tdex-protobuf v0.0.0-20220310134014-ac3f6ebd7d36/go.mod h1:tVWv01BSMH/neJOsixdDFU5T0ll0OZbPliLXBsYQjA8=
github.com/thanhpk/randstr v1.0.4 h1:IN78qu/bR+My+gHCvMEXhR/i5oriVHcTB/BJJIRTsNo=
github.com/thanhpk/randstr v1.0.4/go.mod h1:M/H2P1eNLZzlDwAzpkkkUvoyNNMbzRGhESZuEQk3r0U=
github.com/timshannon/badgerhold/v2 v2.0.0-20201016201833-94bc303c76d4 h1:5g8lFrH34MM7MhZyluuTOJEuCjDHPgFZfNSHvOBLaNE=
Expand Down
58 changes: 29 additions & 29 deletions internal/interfaces/grpc/handler/trade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,76 +14,76 @@ import (

const ErrCannotServeRequest = "cannot serve request, please retry"

type traderHandler struct {
type tradeHandler struct {
tdexv1.UnimplementedTradeServer
traderSvc application.TradeService
tradeSvc application.TradeService
}

func NewTraderHandler(
traderSvc application.TradeService,
func NewTradeHandler(
tradeSvc application.TradeService,
) tdexv1.TradeServer {
return newTraderHandler(traderSvc)
return newTradeHandler(tradeSvc)
}

func newTraderHandler(
traderSvc application.TradeService,
) *traderHandler {
return &traderHandler{
traderSvc: traderSvc,
func newTradeHandler(
tradeSvc application.TradeService,
) *tradeHandler {
return &tradeHandler{
tradeSvc: tradeSvc,
}
}

func (t traderHandler) Markets(
func (t tradeHandler) Markets(
ctx context.Context,
req *tdexv1.MarketsRequest,
) (*tdexv1.MarketsReply, error) {
return t.markets(ctx, req)
}

func (t traderHandler) Balances(
func (t tradeHandler) Balances(
ctx context.Context,
req *tdexv1.BalancesRequest,
) (*tdexv1.BalancesReply, error) {
return t.balances(ctx, req)
}

func (t traderHandler) MarketPrice(
func (t tradeHandler) MarketPrice(
ctx context.Context,
req *tdexv1.MarketPriceRequest,
) (*tdexv1.MarketPriceReply, error) {
return t.marketPrice(ctx, req)
}

func (t traderHandler) TradePropose(
func (t tradeHandler) TradePropose(
req *tdexv1.TradeProposeRequest,
stream tdexv1.Trade_TradeProposeServer,
) error {
return t.tradePropose(stream, req)
}

func (t traderHandler) ProposeTrade(
func (t tradeHandler) ProposeTrade(
ctx context.Context, req *tdexv1.ProposeTradeRequest,
) (*tdexv1.ProposeTradeReply, error) {
return t.proposeTrade(ctx, req)
}

func (t traderHandler) TradeComplete(
func (t tradeHandler) TradeComplete(
req *tdexv1.TradeCompleteRequest, stream tdexv1.Trade_TradeCompleteServer,
) error {
return t.tradeComplete(stream, req)
}

func (t traderHandler) CompleteTrade(
func (t tradeHandler) CompleteTrade(
ctx context.Context, req *tdexv1.CompleteTradeRequest,
) (*tdexv1.CompleteTradeReply, error) {
return t.completeTrade(ctx, req)
}

func (t traderHandler) markets(
func (t tradeHandler) markets(
ctx context.Context,
req *tdexv1.MarketsRequest,
) (*tdexv1.MarketsReply, error) {
markets, err := t.traderSvc.GetTradableMarkets(ctx)
markets, err := t.tradeSvc.GetTradableMarkets(ctx)
if err != nil {
return nil, err
}
Expand All @@ -109,7 +109,7 @@ func (t traderHandler) markets(
return &tdexv1.MarketsReply{Markets: marketsWithFee}, nil
}

func (t traderHandler) balances(
func (t tradeHandler) balances(
ctx context.Context,
req *tdexv1.BalancesRequest,
) (*tdexv1.BalancesReply, error) {
Expand All @@ -118,7 +118,7 @@ func (t traderHandler) balances(
return nil, status.Error(codes.InvalidArgument, err.Error())
}

balance, err := t.traderSvc.GetMarketBalance(ctx, market)
balance, err := t.tradeSvc.GetMarketBalance(ctx, market)
if err != nil {
return nil, err
}
Expand All @@ -143,7 +143,7 @@ func (t traderHandler) balances(
}, nil
}

func (t traderHandler) marketPrice(
func (t tradeHandler) marketPrice(
ctx context.Context,
req *tdexv1.MarketPriceRequest,
) (*tdexv1.MarketPriceReply, error) {
Expand All @@ -164,7 +164,7 @@ func (t traderHandler) marketPrice(
return nil, status.Error(codes.InvalidArgument, err.Error())
}

preview, err := t.traderSvc.GetMarketPrice(
preview, err := t.tradeSvc.GetMarketPrice(
ctx, market, int(tradeType), amount, asset,
)
if err != nil {
Expand Down Expand Up @@ -199,7 +199,7 @@ func (t traderHandler) marketPrice(
}, nil
}

func (t traderHandler) proposeTrade(
func (t tradeHandler) proposeTrade(
ctx context.Context, req *tdexv1.ProposeTradeRequest,
) (*tdexv1.ProposeTradeReply, error) {
market, err := parseMarket(req.GetMarket())
Expand All @@ -215,7 +215,7 @@ func (t traderHandler) proposeTrade(
return nil, status.Error(codes.InvalidArgument, err.Error())
}

accept, fail, swapExpiryTime, err := t.traderSvc.TradePropose(
accept, fail, swapExpiryTime, err := t.tradeSvc.TradePropose(
ctx, market, int(tradeType), swapRequest,
)
if err != nil {
Expand Down Expand Up @@ -250,7 +250,7 @@ func (t traderHandler) proposeTrade(
}, nil
}

func (t traderHandler) completeTrade(
func (t tradeHandler) completeTrade(
ctx context.Context, req *tdexv1.CompleteTradeRequest,
) (*tdexv1.CompleteTradeReply, error) {
var swapComplete domain.SwapComplete
Expand All @@ -261,7 +261,7 @@ func (t traderHandler) completeTrade(
if s := req.SwapFail; s != nil {
swapFail = s
}
txID, fail, err := t.traderSvc.TradeComplete(
txID, fail, err := t.tradeSvc.TradeComplete(
ctx, swapComplete, swapFail,
)
if err != nil {
Expand All @@ -284,7 +284,7 @@ func (t traderHandler) completeTrade(
}, nil
}

func (t traderHandler) tradePropose(
func (t tradeHandler) tradePropose(
stream tdexv1.Trade_TradeProposeServer, req *tdexv1.TradeProposeRequest,
) error {
rr := &tdexv1.ProposeTradeRequest{
Expand All @@ -308,7 +308,7 @@ func (t traderHandler) tradePropose(
return nil
}

func (t traderHandler) tradeComplete(
func (t tradeHandler) tradeComplete(
stream tdexv1.Trade_TradeCompleteServer, req *tdexv1.TradeCompleteRequest,
) error {
rr := &tdexv1.CompleteTradeRequest{
Expand Down
Loading

0 comments on commit 62369a0

Please sign in to comment.