Skip to content

Commit

Permalink
move to bitfinex/rest
Browse files Browse the repository at this point in the history
  • Loading branch information
dasbd72 committed Mar 2, 2024
1 parent 33dbe29 commit 478bd42
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 39 deletions.
2 changes: 1 addition & 1 deletion bitfinex/client.go → bitfinex/rest/client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion bitfinex/client_test.go → bitfinex/rest/client_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion bitfinex/errors.go → bitfinex/rest/errors.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion bitfinex/errors_test.go → bitfinex/rest/errors_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion bitfinex/request.go → bitfinex/rest/request.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion bitfinex/request_test.go → bitfinex/rest/request_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"net/http"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bitfinex
package bitfinexRest

import (
"context"
Expand Down
8 changes: 4 additions & 4 deletions cmd/ccy-cli/balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"

"github.com/dasbd72/go-exchange-sdk/binance"
"github.com/dasbd72/go-exchange-sdk/bitfinex"
bitfinexRest "github.com/dasbd72/go-exchange-sdk/bitfinex/rest"
"github.com/dasbd72/go-exchange-sdk/manager"
"github.com/dasbd72/go-exchange-sdk/max"
"github.com/dasbd72/go-exchange-sdk/okx"
Expand Down Expand Up @@ -37,9 +37,9 @@ func Balance(cmd *cobra.Command, args []string) error {
}

c := manager.Client_builder{
BinanceClient: binance.NewClient(binanceApiKey, binanceApiSecret),
OkxClient: okx.NewClient(okxApiKey, okxApiSecret, okxPassphrase),
BitfinexClient: bitfinex.NewClient(bitfinexApiKey, bitfinexApiSecret),
BinanceClient: binance.NewClient(binanceApiKey, binanceApiSecret),
OkxClient: okx.NewClient(okxApiKey, okxApiSecret, okxPassphrase),
BitfinexRestClient: bitfinexRest.NewClient(bitfinexApiKey, bitfinexApiSecret),
}.Build()

balance, err := c.GetBalance(ctx)
Expand Down
35 changes: 20 additions & 15 deletions cmd/ccy-cli/bitfinex.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ import (
"log"
"os"

"github.com/dasbd72/go-exchange-sdk/bitfinex"
bitfinexRest "github.com/dasbd72/go-exchange-sdk/bitfinex/rest"
"github.com/spf13/cobra"
)

func Bitfinex(cmd *cobra.Command, args []string) {
ctx := context.Background()
// Create a new bitfinex client
c := bitfinex.NewClient(
c := bitfinexRest.NewClient(
os.Getenv("BFX_API_KEY"),
os.Getenv("BFX_API_SECRET"),
)

// data, err := c.CallAPI(ctx, bitfinex.Request_builder{
// data, err := c.CallAPI(ctx, bfxRest.Request_builder{
// Method: http.MethodGet,
// Endpoint: "/ticker",
// SecType: bitfinex.SecTypePrivate,
// SecType: bfxRest.SecTypePrivate,
// Params: map[string]interface{}{},
// }.Build())
// if err != nil {
Expand All @@ -44,21 +44,26 @@ func Bitfinex(cmd *cobra.Command, args []string) {
// if err != nil {
// log.Fatal(err)
// }
// for _, v := range data.FundingStatArray {
// if v.MTS.Int() != data.FundingStatArray[0].MTS.Int() {
// break
// }
// b, err := json.MarshalIndent(v, "", " ")
// if err != nil {
// log.Fatal(err)
// }
// log.Println(string(b))
// }
// }
// {
// data, err := c.GetActiveFundingOffers(ctx, "fUSD")
// if err != nil {
// log.Fatal(err)
// }
// b, err := json.MarshalIndent(data, "", " ")
// if err != nil {
// log.Fatal(err)
// }
// log.Println(string(b))
// }
{
data, err := c.GetActiveFundingOffers(ctx, "fUSD")
if err != nil {
log.Fatal(err)
}
b, err := json.MarshalIndent(data, "", " ")
if err != nil {
log.Fatal(err)
}
log.Println(string(b))
}
}
4 changes: 2 additions & 2 deletions manager/balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ func (c *Client) GetBalance(ctx context.Context) (*Balance, error) {
return nil
},
func() error {
if c.bitfinexClient == nil {
if c.bitfinexRestClient == nil {
// Skip if bitfinex client is not set
return nil
}
sum := 0.0
// Get balance from wallet
res, err := c.bitfinexClient.GetWallets(ctx)
res, err := c.bitfinexRestClient.GetWallets(ctx)
if err != nil {
return err
}
Expand Down
20 changes: 10 additions & 10 deletions manager/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ package manager

import (
"github.com/dasbd72/go-exchange-sdk/binance"
"github.com/dasbd72/go-exchange-sdk/bitfinex"
bitfinexRest "github.com/dasbd72/go-exchange-sdk/bitfinex/rest"
"github.com/dasbd72/go-exchange-sdk/okx"
)

type Client struct {
binanceClient *binance.Client
okxClient *okx.Client
bitfinexClient *bitfinex.Client
binanceClient *binance.Client
okxClient *okx.Client
bitfinexRestClient *bitfinexRest.Client
}

type Client_builder struct {
BinanceClient *binance.Client
OkxClient *okx.Client
BitfinexClient *bitfinex.Client
BinanceClient *binance.Client
OkxClient *okx.Client
BitfinexRestClient *bitfinexRest.Client
}

func (b Client_builder) Build() *Client {
return &Client{
binanceClient: b.BinanceClient,
okxClient: b.OkxClient,
bitfinexClient: b.BitfinexClient,
binanceClient: b.BinanceClient,
okxClient: b.OkxClient,
bitfinexRestClient: b.BitfinexRestClient,
}
}

0 comments on commit 478bd42

Please sign in to comment.