d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 15:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed structs to remove package name

Browse Source
This commit is contained in:
Andrew Jackson
2019-12-13 08:26:55 +11:00
parent 732e9735ba
commit b8e8c25f78
58 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/exchange_wrapper_coverage/main.go
View File

@@ -174,7 +174,7 @@ func testWrappers(e exchange.IBotExchange) []string {
funcs = append(funcs, "GetDepositAddress")
}
_, err = e.WithdrawCryptocurrencyFunds(&withdraw.CryptoWithdrawRequest{})
_, err = e.WithdrawCryptocurrencyFunds(&withdraw.CryptoRequest{})
if err == common.ErrNotYetImplemented {
funcs = append(funcs, "WithdrawCryptocurrencyFunds")
}

30
cmd/exchange_wrapper_issues/main.go
View File

@@ -620,13 +620,13 @@ func testWrappers(e exchange.IBotExchange, base *exchange.Base, config *Config)
Response: jsonifyInterface([]interface{}{r19}),
})
genericWithdrawRequest := withdraw.GenericWithdrawRequestInfo{
genericWithdrawRequest := withdraw.GenericInfo{
Amount: config.OrderSubmission.Amount,
Currency: p.Quote,
}
withdrawRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: genericWithdrawRequest,
Address: withdrawAddressOverride,
withdrawRequest := withdraw.CryptoRequest{
GenericInfo: genericWithdrawRequest,
Address: withdrawAddressOverride,
}
var r20 string
r20, err = e.WithdrawCryptocurrencyFunds(&withdrawRequest)
@@ -665,17 +665,17 @@ func testWrappers(e exchange.IBotExchange, base *exchange.Base, config *Config)
})
fiatWithdrawRequest := withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: genericWithdrawRequest,
BankAccountName: config.BankDetails.BankAccountName,
BankAccountNumber: config.BankDetails.BankAccountNumber,
SwiftCode: config.BankDetails.SwiftCode,
IBAN: config.BankDetails.Iban,
BankCity: config.BankDetails.BankCity,
BankName: config.BankDetails.BankName,
BankAddress: config.BankDetails.BankAddress,
BankCountry: config.BankDetails.BankCountry,
BankPostalCode: config.BankDetails.BankPostalCode,
BankCode: config.BankDetails.BankCode,
GenericInfo: genericWithdrawRequest,
BankAccountName: config.BankDetails.BankAccountName,
BankAccountNumber: config.BankDetails.BankAccountNumber,
SwiftCode: config.BankDetails.SwiftCode,
IBAN: config.BankDetails.Iban,
BankCity: config.BankDetails.BankCity,
BankName: config.BankDetails.BankName,
BankAddress: config.BankDetails.BankAddress,
BankCountry: config.BankDetails.BankCountry,
BankPostalCode: config.BankDetails.BankPostalCode,
BankCode: config.BankDetails.BankCode,
IsExpressWire: config.BankDetails.IsExpressWire,
RequiresIntermediaryBank: config.BankDetails.RequiresIntermediaryBank,
IntermediaryBankName: config.BankDetails.IntermediaryBankName,

2
engine/helpers.go
View File

@@ -700,7 +700,7 @@ func GetExchangeCryptocurrencyDepositAddresses() map[string]map[string]string {
}
// WithdrawCryptocurrencyFundsByExchange withdraws the desired cryptocurrency and amount to a desired cryptocurrency address
func WithdrawCryptocurrencyFundsByExchange(exchName string, req *withdraw.CryptoWithdrawRequest) (string, error) {
func WithdrawCryptocurrencyFundsByExchange(exchName string, req *withdraw.CryptoRequest) (string, error) {
if req == nil {
return "", errors.New("crypto withdraw request param is nil")
}

2
exchanges/alphapoint/alphapoint_test.go
View File

@@ -561,7 +561,7 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
t.Parallel()
var withdrawCryptoRequest = withdraw.CryptoWithdrawRequest{}
var withdrawCryptoRequest = withdraw.CryptoRequest{}
_, err := a.WithdrawCryptocurrencyFunds(&withdrawCryptoRequest)
if err != common.ErrNotYetImplemented {
t.Errorf("Expected 'Not implemented', received %v", err)

2
exchanges/alphapoint/alphapoint_wrapper.go
View File

@@ -283,7 +283,7 @@ func (a *Alphapoint) GetDepositAddress(cryptocurrency currency.Code, _ string) (
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (a *Alphapoint) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (a *Alphapoint) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrNotYetImplemented
}

4
exchanges/anx/anx_test.go
View File

@@ -327,8 +327,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/anx/anx_wrapper.go
View File

@@ -418,7 +418,7 @@ func (a *ANX) GetDepositAddress(cryptocurrency currency.Code, _ string) (string,
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (a *ANX) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (a *ANX) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return a.Send(withdrawRequest.Currency.String(), withdrawRequest.Address, "", strconv.FormatFloat(withdrawRequest.Amount, 'f', -1, 64))
}

4
exchanges/binance/binance_test.go
View File

@@ -454,8 +454,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: 0,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/binance/binance_wrapper.go
View File

@@ -495,7 +495,7 @@ func (b *Binance) GetDepositAddress(cryptocurrency currency.Code, _ string) (str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Binance) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Binance) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
amountStr := strconv.FormatFloat(withdrawRequest.Amount, 'f', -1, 64)
return b.WithdrawCrypto(withdrawRequest.Currency.String(),
withdrawRequest.Address,

8
exchanges/bitfinex/bitfinex_test.go
View File

@@ -885,8 +885,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",
@@ -910,7 +910,7 @@ func TestWithdrawFiat(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.USD,
Description: "WITHDRAW IT ALL",
@@ -943,7 +943,7 @@ func TestWithdrawInternationalBank(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/bitfinex/bitfinex_wrapper.go
View File

@@ -486,7 +486,7 @@ func (b *Bitfinex) GetDepositAddress(cryptocurrency currency.Code, accountID str
}
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is submitted
func (b *Bitfinex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bitfinex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
withdrawalType := b.ConvertSymbolToWithdrawalType(withdrawRequest.Currency)
// Bitfinex has support for three types, exchange, margin and deposit
// As this is for trading, I've made the wrapper default 'exchange'

4
exchanges/bitflyer/bitflyer_test.go
View File

@@ -367,8 +367,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/bitflyer/bitflyer_wrapper.go
View File

@@ -310,7 +310,7 @@ func (b *Bitflyer) GetDepositAddress(cryptocurrency currency.Code, accountID str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Bitflyer) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bitflyer) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrNotYetImplemented
}

6
exchanges/bithumb/bithumb_test.go
View File

@@ -449,8 +449,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",
@@ -474,7 +474,7 @@ func TestWithdrawFiat(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.USD,
Description: "WITHDRAW IT ALL",

2
exchanges/bithumb/bithumb_wrapper.go
View File

@@ -408,7 +408,7 @@ func (b *Bithumb) GetDepositAddress(cryptocurrency currency.Code, _ string) (str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Bithumb) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bithumb) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
_, err := b.WithdrawCrypto(withdrawRequest.Address,
withdrawRequest.AddressTag,
withdrawRequest.Currency.String(),

4
exchanges/bitmex/bitmex_test.go
View File

@@ -607,8 +607,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/bitmex/bitmex_wrapper.go
View File

@@ -510,7 +510,7 @@ func (b *Bitmex) GetDepositAddress(cryptocurrency currency.Code, _ string) (stri
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Bitmex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bitmex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
var request = UserRequestWithdrawalParams{
Address: withdrawRequest.Address,
Amount: withdrawRequest.Amount,

8
exchanges/bitstamp/bitstamp_test.go
View File

@@ -455,8 +455,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",
@@ -483,7 +483,7 @@ func TestWithdrawFiat(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.USD,
Description: "WITHDRAW IT ALL",
@@ -521,7 +521,7 @@ func TestWithdrawInternationalBank(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.USD,
Description: "WITHDRAW IT ALL",

2
exchanges/bitstamp/bitstamp_wrapper.go
View File

@@ -421,7 +421,7 @@ func (b *Bitstamp) GetDepositAddress(cryptocurrency currency.Code, _ string) (st
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Bitstamp) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bitstamp) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := b.CryptoWithdrawal(withdrawRequest.Amount,
withdrawRequest.Address,
withdrawRequest.Currency.String(),

4
exchanges/bittrex/bittrex_test.go
View File

@@ -443,8 +443,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/bittrex/bittrex_wrapper.go
View File

@@ -409,7 +409,7 @@ func (b *Bittrex) GetDepositAddress(cryptocurrency currency.Code, _ string) (str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *Bittrex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *Bittrex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
uuid, err := b.Withdraw(withdrawRequest.Currency.String(), withdrawRequest.AddressTag, withdrawRequest.Address, withdrawRequest.Amount)
return uuid.Result.ID, err
}

6
exchanges/btcmarkets/btcmarkets_wrapper.go
View File

@@ -478,7 +478,7 @@ func (b *BTCMarkets) GetDepositAddress(cryptocurrency currency.Code, accountID s
}
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is submitted
func (b *BTCMarkets) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *BTCMarkets) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
a, err := b.RequestWithdraw(withdrawRequest.Currency.String(),
withdrawRequest.Amount,
withdrawRequest.Address,
@@ -498,8 +498,8 @@ func (b *BTCMarkets) WithdrawFiatFunds(withdrawRequest *withdraw.FiatWithdrawReq
if withdrawRequest.Currency != currency.AUD {
return "", errors.New("only aud is supported for withdrawals")
}
a, err := b.RequestWithdraw(withdrawRequest.GenericWithdrawRequestInfo.Currency.String(),
withdrawRequest.GenericWithdrawRequestInfo.Amount,
a, err := b.RequestWithdraw(withdrawRequest.GenericInfo.Currency.String(),
withdrawRequest.GenericInfo.Amount,
"",
withdrawRequest.BankAccountName,
withdrawRequest.BankAccountNumber,

2
exchanges/btse/btse_wrapper.go
View File

@@ -498,7 +498,7 @@ func (b *BTSE) GetDepositAddress(cryptocurrency currency.Code, accountID string)
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (b *BTSE) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (b *BTSE) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrFunctionNotSupported
}

8
exchanges/coinbasepro/coinbasepro_test.go
View File

@@ -499,8 +499,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",
@@ -527,7 +527,7 @@ func TestWithdrawFiat(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: 100,
Currency: currency.USD,
},
@@ -549,7 +549,7 @@ func TestWithdrawInternationalBank(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: 100,
Currency: currency.USD,
},

2
exchanges/coinbasepro/coinbasepro_wrapper.go
View File

@@ -448,7 +448,7 @@ func (c *CoinbasePro) GetDepositAddress(cryptocurrency currency.Code, accountID
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (c *CoinbasePro) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (c *CoinbasePro) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := c.WithdrawCrypto(withdrawRequest.Amount, withdrawRequest.Currency.String(), withdrawRequest.Address)
return resp.ID, err
}

2
exchanges/coinbene/coinbene_wrapper.go
View File

@@ -457,7 +457,7 @@ func (c *Coinbene) GetDepositAddress(cryptocurrency currency.Code, accountID str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (c *Coinbene) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (c *Coinbene) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrFunctionNotSupported
}

4
exchanges/coinut/coinut_test.go
View File

@@ -383,8 +383,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/coinut/coinut_wrapper.go
View File

@@ -649,7 +649,7 @@ func (c *COINUT) GetDepositAddress(cryptocurrency currency.Code, accountID strin
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (c *COINUT) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (c *COINUT) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrFunctionNotSupported
}

4
exchanges/exmo/exmo_test.go
View File

@@ -383,8 +383,8 @@ func TestWithdraw(t *testing.T) {
t.Skip("API keys set, canManipulateRealOrders false, skipping test")
}
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/exmo/exmo_wrapper.go
View File

@@ -419,7 +419,7 @@ func (e *EXMO) GetDepositAddress(cryptocurrency currency.Code, _ string) (string
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (e *EXMO) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (e *EXMO) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := e.WithdrawCryptocurrency(withdrawRequest.Currency.String(),
withdrawRequest.Address,
withdrawRequest.AddressTag,

4
exchanges/gateio/gateio_test.go
View File

@@ -406,8 +406,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/gateio/gateio_wrapper.go
View File

@@ -525,7 +525,7 @@ func (g *Gateio) GetDepositAddress(cryptocurrency currency.Code, _ string) (stri
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (g *Gateio) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (g *Gateio) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return g.WithdrawCrypto(withdrawRequest.Currency.String(), withdrawRequest.Address, withdrawRequest.Amount)
}

4
exchanges/gemini/gemini_test.go
View File

@@ -478,8 +478,8 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
t.Parallel()
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/gemini/gemini_wrapper.go
View File

@@ -397,7 +397,7 @@ func (g *Gemini) GetDepositAddress(cryptocurrency currency.Code, _ string) (stri
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (g *Gemini) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (g *Gemini) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := g.WithdrawCrypto(withdrawRequest.Address, withdrawRequest.Currency.String(), withdrawRequest.Amount)
if err != nil {
return "", err

4
exchanges/hitbtc/hitbtc_test.go
View File

@@ -340,8 +340,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/hitbtc/hitbtc_wrapper.go
View File

@@ -470,7 +470,7 @@ func (h *HitBTC) GetDepositAddress(currency currency.Code, _ string) (string, er
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (h *HitBTC) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (h *HitBTC) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
_, err := h.Withdraw(withdrawRequest.Currency.String(), withdrawRequest.Address, withdrawRequest.Amount)
return "", err
}

4
exchanges/huobi/huobi_test.go
View File

@@ -588,8 +588,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/huobi/huobi_wrapper.go
View File

@@ -640,7 +640,7 @@ func (h *HUOBI) GetDepositAddress(cryptocurrency currency.Code, accountID string
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (h *HUOBI) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (h *HUOBI) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := h.Withdraw(withdrawRequest.Currency, withdrawRequest.Address, withdrawRequest.AddressTag, withdrawRequest.Amount, withdrawRequest.FeeAmount)
return strconv.FormatInt(resp, 10), err
}

2
exchanges/interfaces.go
View File

@@ -51,7 +51,7 @@ type IBotExchange interface {
GetDepositAddress(cryptocurrency currency.Code, accountID string) (string, error)
GetOrderHistory(getOrdersRequest *order.GetOrdersRequest) ([]order.Detail, error)
GetActiveOrders(getOrdersRequest *order.GetOrdersRequest) ([]order.Detail, error)
WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error)
WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error)
WithdrawFiatFunds(withdrawRequest *withdraw.FiatWithdrawRequest) (string, error)
WithdrawFiatFundsToInternationalBank(withdrawRequest *withdraw.FiatWithdrawRequest) (string, error)
SetHTTPClientUserAgent(ua string)

4
exchanges/itbit/itbit_test.go
View File

@@ -390,8 +390,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/itbit/itbit_wrapper.go
View File

@@ -393,7 +393,7 @@ func (i *ItBit) GetDepositAddress(cryptocurrency currency.Code, accountID string
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (i *ItBit) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (i *ItBit) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "", common.ErrFunctionNotSupported
}

8
exchanges/kraken/kraken_test.go
View File

@@ -530,8 +530,8 @@ func TestModifyOrder(t *testing.T) {
// TestWithdraw wrapper test
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.XXBT,
Description: "WITHDRAW IT ALL",
@@ -560,7 +560,7 @@ func TestWithdrawFiat(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.EUR,
Description: "WITHDRAW IT ALL",
@@ -584,7 +584,7 @@ func TestWithdrawInternationalBank(t *testing.T) {
}
var withdrawFiatRequest = withdraw.FiatWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.EUR,
Description: "WITHDRAW IT ALL",

2
exchanges/kraken/kraken_wrapper.go
View File

@@ -570,7 +570,7 @@ func (k *Kraken) GetDepositAddress(cryptocurrency currency.Code, _ string) (stri
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal
// Populate exchange.WithdrawRequest.TradePassword with withdrawal key name, as set up on your account
func (k *Kraken) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (k *Kraken) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return k.Withdraw(withdrawRequest.Currency.String(), withdrawRequest.TradePassword, withdrawRequest.Amount)
}

4
exchanges/lakebtc/lakebtc_test.go
View File

@@ -376,8 +376,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/lakebtc/lakebtc_wrapper.go
View File

@@ -405,7 +405,7 @@ func (l *LakeBTC) GetDepositAddress(cryptocurrency currency.Code, _ string) (str
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (l *LakeBTC) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (l *LakeBTC) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
if withdrawRequest.Currency != currency.BTC {
return "", errors.New("only BTC supported for withdrawals")
}

2
exchanges/lbank/lbank_wrapper.go
View File

@@ -454,7 +454,7 @@ func (l *Lbank) GetDepositAddress(cryptocurrency currency.Code, accountID string
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (l *Lbank) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (l *Lbank) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := l.Withdraw(withdrawRequest.Address, withdrawRequest.Currency.String(),
strconv.FormatFloat(withdrawRequest.Amount, 'f', -1, 64), "",
withdrawRequest.Description, "")

4
exchanges/localbitcoins/localbitcoins_test.go
View File

@@ -333,8 +333,8 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
t.Parallel()
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/localbitcoins/localbitcoins_wrapper.go
View File

@@ -394,7 +394,7 @@ func (l *LocalBitcoins) GetDepositAddress(cryptocurrency currency.Code, _ string
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (l *LocalBitcoins) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (l *LocalBitcoins) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return "",
l.WalletSend(withdrawRequest.Address,
withdrawRequest.Amount,

4
exchanges/okcoin/okcoin_test.go
View File

@@ -1059,8 +1059,8 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
TestSetRealOrderDefaults(t)
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

4
exchanges/okex/okex_test.go
View File

@@ -1752,8 +1752,8 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
TestSetRealOrderDefaults(t)
t.Parallel()
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/okgroup/okgroup_wrapper.go
View File

@@ -367,7 +367,7 @@ func (o *OKGroup) GetDepositAddress(p currency.Code, accountID string) (string,
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (o *OKGroup) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (o *OKGroup) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
withdrawal, err := o.AccountWithdraw(AccountWithdrawRequest{
Amount: withdrawRequest.Amount,
Currency: withdrawRequest.Currency.Lower().String(),

4
exchanges/poloniex/poloniex_test.go
View File

@@ -348,8 +348,8 @@ func TestModifyOrder(t *testing.T) {
func TestWithdraw(t *testing.T) {
t.Parallel()
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: 0,
Currency: currency.LTC,
Description: "WITHDRAW IT ALL",

2
exchanges/poloniex/poloniex_wrapper.go
View File

@@ -463,7 +463,7 @@ func (p *Poloniex) GetDepositAddress(cryptocurrency currency.Code, _ string) (st
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (p *Poloniex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (p *Poloniex) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
_, err := p.Withdraw(withdrawRequest.Currency.String(), withdrawRequest.Address, withdrawRequest.Amount)
return "", err
}

12
exchanges/withdraw/withdraw_types.go
View File

@@ -2,8 +2,8 @@ package withdraw
import "github.com/thrasher-corp/gocryptotrader/currency"
// GenericWithdrawRequestInfo stores genric withdraw request info
type GenericWithdrawRequestInfo struct {
// GenericInfo stores genric withdraw request info
type GenericInfo struct {
// General withdraw information
Currency currency.Code
Description string
@@ -14,9 +14,9 @@ type GenericWithdrawRequestInfo struct {
Amount float64
}
// CryptoWithdrawRequest stores the info required for a crypto withdrawal request
type CryptoWithdrawRequest struct {
GenericWithdrawRequestInfo
// CryptoRequest stores the info required for a crypto withdrawal request
type CryptoRequest struct {
GenericInfo
// Crypto related information
Address string
AddressTag string
@@ -25,7 +25,7 @@ type CryptoWithdrawRequest struct {
// FiatWithdrawRequest used for fiat withdrawal requests
type FiatWithdrawRequest struct {
GenericWithdrawRequestInfo
GenericInfo
// FIAT related information
BankAccountName string
BankAccountNumber string

4
exchanges/yobit/yobit_test.go
View File

@@ -446,8 +446,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/yobit/yobit_wrapper.go
View File

@@ -407,7 +407,7 @@ func (y *Yobit) GetDepositAddress(cryptocurrency currency.Code, _ string) (strin
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (y *Yobit) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (y *Yobit) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
resp, err := y.WithdrawCoinsToAddress(withdrawRequest.Currency.String(), withdrawRequest.Amount, withdrawRequest.Address)
if err != nil {
return "", err

4
exchanges/zb/zb_test.go
View File

@@ -414,8 +414,8 @@ func TestModifyOrder(t *testing.T) {
}
func TestWithdraw(t *testing.T) {
withdrawCryptoRequest := withdraw.CryptoWithdrawRequest{
GenericWithdrawRequestInfo: withdraw.GenericWithdrawRequestInfo{
withdrawCryptoRequest := withdraw.CryptoRequest{
GenericInfo: withdraw.GenericInfo{
Amount: -1,
Currency: currency.BTC,
Description: "WITHDRAW IT ALL",

2
exchanges/zb/zb_wrapper.go
View File

@@ -499,7 +499,7 @@ func (z *ZB) GetDepositAddress(cryptocurrency currency.Code, _ string) (string,
// WithdrawCryptocurrencyFunds returns a withdrawal ID when a withdrawal is
// submitted
func (z *ZB) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoWithdrawRequest) (string, error) {
func (z *ZB) WithdrawCryptocurrencyFunds(withdrawRequest *withdraw.CryptoRequest) (string, error) {
return z.Withdraw(withdrawRequest.Currency.Lower().String(), withdrawRequest.Address, withdrawRequest.TradePassword, withdrawRequest.Amount, withdrawRequest.FeeAmount, false)
}