Skip to content
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

Jump to bottom

fix: expose transporter in clients #27

Merged
merged 1 commit into from
Sep 11, 2022
Merged

fix: expose transporter in clients #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions rest/inverse_perpetual/market/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

type InversePerpetualMarketClient struct {
transporter transport.Transporter
Transporter transport.Transporter
}

// NewInversePerpetualMarketClient - create a new inverse perpetual market client.
Expand All @@ -15,6 +15,6 @@ type InversePerpetualMarketClient struct {
func NewInversePerpetualMarketClient(url, apiKey, apiSecret string) *InversePerpetualMarketClient {
transporter := httpTransport.New(url, apiKey, apiSecret)
return &InversePerpetualMarketClient{
transporter: transporter,
Transporter: transporter,
}
}
22 changes: 11 additions & 11 deletions rest/inverse_perpetual/market/market.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-orderbook
func (c *InversePerpetualMarketClient) OrderBook(ctx context.Context, params *inverseperp.OrderBookParams) (response *inverseperp.OrderBookResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualOrderBookPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualOrderBookPath, params, &response)
if err != nil {
return
}
Expand All @@ -25,7 +25,7 @@ func (c *InversePerpetualMarketClient) OrderBook(ctx context.Context, params *in
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-querykline
func (c *InversePerpetualMarketClient) QueryKline(ctx context.Context, params *inverseperp.QueryKlineParams) (response *inverseperp.QueryKlineResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryKlinePath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryKlinePath, params, &response)
if err != nil {
return
}
Expand All @@ -36,7 +36,7 @@ func (c *InversePerpetualMarketClient) QueryKline(ctx context.Context, params *i
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-latestsymbolinfo
func (c *InversePerpetualMarketClient) GetSymbolInformation(ctx context.Context, params *inverseperp.GetSymbolInformationParams) (response *inverseperp.GetSymbolInformationResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualSymbolInformationPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualSymbolInformationPath, params, &response)
if err != nil {
return
}
Expand All @@ -47,7 +47,7 @@ func (c *InversePerpetualMarketClient) GetSymbolInformation(ctx context.Context,
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-publictradingrecords
func (c *InversePerpetualMarketClient) PublicTradingRecords(ctx context.Context, params *inverseperp.PublicTradingRecordsParams) (response *inverseperp.PublicTradingRecordsResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualPublicTradingRecordsPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualPublicTradingRecordsPath, params, &response)
if err != nil {
return
}
Expand All @@ -58,7 +58,7 @@ func (c *InversePerpetualMarketClient) PublicTradingRecords(ctx context.Context,
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-querysymbol
func (c *InversePerpetualMarketClient) QuerySymbols(ctx context.Context) (response *inverseperp.QuerySymbolsResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQuerySymbolPath, nil, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQuerySymbolPath, nil, &response)
if err != nil {
return
}
Expand All @@ -69,7 +69,7 @@ func (c *InversePerpetualMarketClient) QuerySymbols(ctx context.Context) (respon
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-markpricekline
func (c *InversePerpetualMarketClient) QueryMarkPriceKline(ctx context.Context, params *inverseperp.QueryMarkPriceKlineParams) (response *inverseperp.QueryMarkPriceKlineResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryMarkPriceKlinePath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryMarkPriceKlinePath, params, &response)
if err != nil {
return
}
Expand All @@ -80,7 +80,7 @@ func (c *InversePerpetualMarketClient) QueryMarkPriceKline(ctx context.Context,
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-queryindexpricekline
func (c *InversePerpetualMarketClient) QueryIndexPriceKline(ctx context.Context, params *inverseperp.QueryIndexPriceKlineParams) (response *inverseperp.QueryIndexPriceKlineResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryIndexPriceKlinePath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryIndexPriceKlinePath, params, &response)
if err != nil {
return
}
Expand All @@ -93,7 +93,7 @@ func (c *InversePerpetualMarketClient) QueryIndexPriceKline(ctx context.Context,
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-querypremiumindexkline
func (c *InversePerpetualMarketClient) QueryPremiumIndexKline(ctx context.Context, params *inverseperp.QueryPremiumIndexKlineParams) (response *inverseperp.QueryPremiumIndexKlineResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryPremiumIndexKlinePath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualQueryPremiumIndexKlinePath, params, &response)
if err != nil {
return
}
Expand All @@ -106,7 +106,7 @@ func (c *InversePerpetualMarketClient) QueryPremiumIndexKline(ctx context.Contex
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-marketopeninterest
func (c *InversePerpetualMarketClient) OpenInterest(ctx context.Context, params *inverseperp.OpenInterestParams) (response *inverseperp.OpenInterestResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualOrderBookPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualOrderBookPath, params, &response)
if err != nil {
return
}
Expand All @@ -121,7 +121,7 @@ func (c *InversePerpetualMarketClient) OpenInterest(ctx context.Context, params
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-marketbigdeal
func (c *InversePerpetualMarketClient) LatestBigDeal(ctx context.Context, params *inverseperp.LatestBigDealParams) (response *inverseperp.LatestBigDealResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualLatestBigDealPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualLatestBigDealPath, params, &response)
if err != nil {
return
}
Expand All @@ -132,7 +132,7 @@ func (c *InversePerpetualMarketClient) LatestBigDeal(ctx context.Context, params
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-marketaccountratio
func (c *InversePerpetualMarketClient) LongShortRatio(ctx context.Context, params *inverseperp.LongShortRatioParams) (response *inverseperp.LongShortRatioResponse, err error) {
err = c.transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualLongShortRatioPath, params, &response)
err = c.Transporter.UnsignedRequest(ctx, http.MethodGet, bybit.PublicInversePerpetualLongShortRatioPath, params, &response)
if err != nil {
return
}
Expand Down
12 changes: 6 additions & 6 deletions rest/linear/account/active_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-placeactive
func (c *LinearAccountClient) PlaceActiveOrder(ctx context.Context, params *linear.PlaceActiveOrderParams) (res *linear.PlaceActiveOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearPlaceOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearPlaceOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -26,7 +26,7 @@ func (c *LinearAccountClient) PlaceActiveOrder(ctx context.Context, params *line
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-getactive
func (c *LinearAccountClient) GetActiveOrder(ctx context.Context, params *linear.GetActiveOrderParams) (res *linear.GetActiveOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetActiveOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetActiveOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -40,7 +40,7 @@ func (c *LinearAccountClient) GetActiveOrder(ctx context.Context, params *linear
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-cancelactive
func (c *LinearAccountClient) CancelActiveOrder(ctx context.Context, params *linear.CancelActiveOrderParams) (res *linear.CancelActiveOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearOrderCancelPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearOrderCancelPath, params, &res)
if err != nil {
return
}
Expand All @@ -52,7 +52,7 @@ func (c *LinearAccountClient) CancelActiveOrder(ctx context.Context, params *lin
// Cancel all active orders that are unfilled or partially filled. Fully filled orders cannot be cancelled.
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-cancelactive
func (c *LinearAccountClient) CancelAllActiveOrders(ctx context.Context, params *linear.CancelAllActiveOrdersParams) (res *linear.CancelAllActiveOrdersResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearOrderCancelAllPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearOrderCancelAllPath, params, &res)
if err != nil {
return
}
Expand All @@ -63,7 +63,7 @@ func (c *LinearAccountClient) CancelAllActiveOrders(ctx context.Context, params
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-replaceactive
func (c *LinearAccountClient) ReplaceActiveOrder(ctx context.Context, params *linear.ReplaceActiveOrderParams) (res *linear.ReplaceActiveOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearReplaceActiveOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearReplaceActiveOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -75,7 +75,7 @@ func (c *LinearAccountClient) ReplaceActiveOrder(ctx context.Context, params *li
// Query real-time active order information. If only order_id or order_link_id are passed, a single order will be returned; otherwise, returns up to 500 unfilled orders.
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-queryactive
func (c *LinearAccountClient) QueryActiveOrder(ctx context.Context, params *linear.QueryActiveOrderParams) (res *linear.QueryActiveOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryActiveOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryActiveOrderPath, params, &res)
if err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion rest/linear/account/api_key_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-key
func (c *LinearAccountClient) GetAPIKeyInfo(ctx context.Context) (res *linear.GetAPIKeyInfoResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetAPIKeyInfoPath, nil, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetAPIKeyInfoPath, nil, &res)
if err != nil {
return
}
Expand Down
4 changes: 2 additions & 2 deletions rest/linear/account/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
)

type LinearAccountClient struct {
transporter transport.Transporter
Transporter transport.Transporter
}

func NewLinearAccountClient(url, apiKey, apiSecret string) *LinearAccountClient {
transporter := httpTransport.New(url, apiKey, apiSecret)
return &LinearAccountClient{
transporter: transporter,
Transporter: transporter,
}
}
14 changes: 7 additions & 7 deletions rest/linear/account/conditional_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-placecond
func (c *LinearAccountClient) PlaceConditionalOrder(ctx context.Context, params *linear.PlaceConditionalOrderParams) (res *linear.PlaceConditionalOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearPlaceConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearPlaceConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -26,7 +26,7 @@ func (c *LinearAccountClient) PlaceConditionalOrder(ctx context.Context, params
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-getcond
func (c *LinearAccountClient) GetConditionalOrder(ctx context.Context, params *linear.GetConditionalOrderParams) (res *linear.GetConditionalOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -40,7 +40,7 @@ func (c *LinearAccountClient) GetConditionalOrder(ctx context.Context, params *l
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-cancelcond
func (c *LinearAccountClient) CancelConditionalOrder(ctx context.Context, params *linear.CancelConditionalOrderParams) (res *linear.CancelConditionalOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearCancelConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearCancelConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -51,7 +51,7 @@ func (c *LinearAccountClient) CancelConditionalOrder(ctx context.Context, params
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-cancelallcond
func (c *LinearAccountClient) CancelAllConditionalOrders(ctx context.Context, params *linear.CancelAllConditionalOrdersParams) (res *linear.CancelAllConditionalOrdersResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearCancelAllConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearCancelAllConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -65,7 +65,7 @@ func (c *LinearAccountClient) CancelAllConditionalOrders(ctx context.Context, pa
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-replacecond
func (c *LinearAccountClient) ReplaceConditionalOrder(ctx context.Context, params *linear.ReplaceConditionalOrderParams) (res *linear.ReplaceConditionalOrderResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearReplaceConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodPost, bybit.PrivateLinearReplaceConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -76,7 +76,7 @@ func (c *LinearAccountClient) ReplaceConditionalOrder(ctx context.Context, param
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-querycond
func (c *LinearAccountClient) QueryConditionalOrderBySymbol(ctx context.Context, params *linear.QueryConditionalOrderBySymbolParams) (res *linear.QueryConditionalOrderBySymbolResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand All @@ -89,7 +89,7 @@ func (c *LinearAccountClient) QueryConditionalOrderBySymbol(ctx context.Context,
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-querycond
func (c *LinearAccountClient) QueryConditionalOrderWithIDs(ctx context.Context, params *linear.QueryConditionalOrderWithIDsParams) (res *linear.QueryConditionalOrderWithIDsResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryConditionalOrderPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearQueryConditionalOrderPath, params, &res)
if err != nil {
return
}
Expand Down
4 changes: 2 additions & 2 deletions rest/linear/account/funding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-predictedfunding
func (c *LinearAccountClient) GetPredictedFundingRate(ctx context.Context, params *linear.PredictedFundingRateParams) (res *linear.PredictedFundingRateResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearPredictedFundingRatePath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearPredictedFundingRatePath, params, &res)
if err != nil {
return
}
Expand All @@ -27,7 +27,7 @@ func (c *LinearAccountClient) GetPredictedFundingRate(ctx context.Context, param
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/linear/#t-mylastfundingfee
func (c *LinearAccountClient) GetLastFundingFee(ctx context.Context, params *linear.GetLastFundingFeeParams) (res *linear.GetLastFundingFeeResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetLastFundingFeePath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetLastFundingFeePath, params, &res)
if err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion rest/linear/account/lcp_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// docs - https://bybit-exchange.github.io/docs/futuresV2/inverse/#t-lcp
func (c *LinearAccountClient) GetLCPInfo(ctx context.Context, params *linear.GetLCPInfoParams) (res *linear.GetLCPInfoResponse, err error) {
err = c.transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetLCPInfoPath, params, &res)
err = c.Transporter.SignedRequest(ctx, http.MethodGet, bybit.PrivateLinearGetLCPInfoPath, params, &res)
if err != nil {
return
}
Expand Down
Loading