diff --git a/bitstamphttp.go b/bitstamphttp.go index 29135b22..36900be7 100644 --- a/bitstamphttp.go +++ b/bitstamphttp.go @@ -4,7 +4,6 @@ import ( "net/http" "net/url" "io/ioutil" - "fmt" "log" "encoding/hex" "encoding/json" @@ -117,7 +116,7 @@ func (b *Bitstamp) GetTicker() (BitstampTicker) { err := SendHTTPRequest(BITSTAMP_API_URL + BITSTAMP_API_TICKER, true, &b.Ticker) if err != nil { - fmt.Println(err) + log.Println(err) return BitstampTicker{} } @@ -128,7 +127,7 @@ func (b *Bitstamp) GetOrderbook() { err := SendHTTPRequest(BITSTAMP_API_URL + BITSTAMP_API_ORDERBOOK, true, &b.Orderbook) if err != nil { - fmt.Println(err) + log.Println(err) return } } @@ -137,7 +136,7 @@ func (b *Bitstamp) GetTransactions() { err := SendHTTPRequest(BITSTAMP_API_URL + BITSTAMP_API_TRANSACTIONS, true, &b.Transactions) if err != nil { - fmt.Println(err) + log.Println(err) return } } @@ -146,7 +145,7 @@ func (b *Bitstamp) GetEURUSDConversionRate() { err := SendHTTPRequest(BITSTAMP_API_URL + BITSTAMP_API_EURUSD, true, &b.ConversionRate) if err != nil { - fmt.Println(err) + log.Println(err) return } } @@ -155,7 +154,7 @@ func (b *Bitstamp) GetBalance() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_BALANCE, url.Values{}, &b.Balance) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -169,7 +168,7 @@ func (b *Bitstamp) GetUserTransactions(offset, limit, sort int64) { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_USER_TRANSACTIONS, req, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -180,7 +179,7 @@ func (b *Bitstamp) CancelOrder(OrderID int64) { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_CANCEL_ORDER, req, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -188,7 +187,7 @@ func (b *Bitstamp) GetOpenOrders() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_OPEN_ORDERS, url.Values{}, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -207,7 +206,7 @@ func (b *Bitstamp) PlaceOrder(price float64, amount float64, Type int) { err := b.SendAuthenticatedHTTPRequest(orderType, req, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -215,7 +214,7 @@ func (b *Bitstamp) GetWithdrawalRequests() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_WITHDRAWAL_REQUESTS, url.Values{}, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -227,7 +226,7 @@ func (b *Bitstamp) BitcoinWithdrawal(amount float64, address string) { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_BITCOIN_WITHDRAWAL, req, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -235,7 +234,7 @@ func (b *Bitstamp) BitcoinDepositAddress() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_BITCOIN_DEPOSIT, url.Values{}, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -243,7 +242,7 @@ func (b *Bitstamp) UnconfirmedBitcoin() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_UNCONFIRMED_BITCOIN, url.Values{}, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -256,7 +255,7 @@ func (b *Bitstamp) RippleWithdrawal(amount float64, address, currency string) { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_RIPPLE_WITHDRAWAL, req, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -264,7 +263,7 @@ func (b *Bitstamp) RippleDepositAddress() { err := b.SendAuthenticatedHTTPRequest(BITSTAMP_API_RIPPLE_DESPOIT, url.Values{}, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -280,7 +279,7 @@ func (b *Bitstamp) SendAuthenticatedHTTPRequest(path string, values url.Values, path = BITSTAMP_API_URL + path if b.Verbose { - fmt.Println("Sending POST request to " + path) + log.Println("Sending POST request to " + path) } req, err := http.NewRequest("POST", path, reqBody) @@ -300,7 +299,7 @@ func (b *Bitstamp) SendAuthenticatedHTTPRequest(path string, values url.Values, contents, _ := ioutil.ReadAll(resp.Body) if b.Verbose { - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) } err = json.Unmarshal(contents, &result) diff --git a/btcchinahttp.go b/btcchinahttp.go index 0045dc9e..2b2fb19b 100644 --- a/btcchinahttp.go +++ b/btcchinahttp.go @@ -79,7 +79,7 @@ func (b *BTCChina) GetTicker(symbol string) (BTCChinaTicker) { req := fmt.Sprintf("%sdata/ticker?market=%s", BTCCHINA_API_URL, symbol) err := SendHTTPRequest(req, true, &resp) if err != nil { - fmt.Println(err) + log.Println(err) return BTCChinaTicker{} } return resp.Ticker @@ -89,7 +89,7 @@ func (b *BTCChina) GetTradesLast24h(symbol string) (bool) { req := fmt.Sprintf("%sdata/trades?market=%s", BTCCHINA_API_URL, symbol) err := SendHTTPRequest(req, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -116,7 +116,7 @@ func (b *BTCChina) GetTradeHistory(symbol string, limit, sinceTid int64, time ti err := SendHTTPRequest(req, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -126,7 +126,7 @@ func (b *BTCChina) GetOrderBook(symbol string, limit int) (bool) { req := fmt.Sprintf("%sdata/orderbook?market=%s&limit=%d", BTCCHINA_API_URL, symbol, limit) err := SendHTTPRequest(req, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -136,7 +136,7 @@ func (b *BTCChina) GetAccountInfo() { err := b.SendAuthenticatedHTTPRequest("getAccountInfo", nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -150,7 +150,7 @@ func (b *BTCChina) BuyOrder(price, amount float64) { err := b.SendAuthenticatedHTTPRequest("buyOrder2", nil) if err != nil { - fmt.Println(err) + log.Println(err) } } diff --git a/btcehttp.go b/btcehttp.go index cec0c50d..1dc54038 100644 --- a/btcehttp.go +++ b/btcehttp.go @@ -12,6 +12,7 @@ import ( "time" "io/ioutil" "fmt" + "log" ) const ( @@ -82,7 +83,7 @@ func (b *BTCE) GetTicker(symbol string) (BTCeTicker) { req := fmt.Sprintf("https://btc-e.com/api/2/%s/ticker", symbol) err := SendHTTPRequest(req, true, &response) if err != nil { - fmt.Println(err) + log.Println(err) return BTCeTicker{} } return response.Ticker @@ -92,7 +93,7 @@ func (b *BTCE) GetInfo() { err := b.SendAuthenticatedHTTPRequest(BTCE_GET_INFO, url.Values{}) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -103,7 +104,7 @@ func (b *BTCE) GetActiveOrders(pair string) { err := b.SendAuthenticatedHTTPRequest(BTCE_ACTIVE_ORDERS, req) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -114,7 +115,7 @@ func (b *BTCE) CancelOrder(OrderID int64) { err := b.SendAuthenticatedHTTPRequest(BTCE_CANCEL_ORDER, req) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -128,7 +129,7 @@ func (b *BTCE) Trade(pair, orderType string, amount, price float64) { err := b.SendAuthenticatedHTTPRequest(BTCE_TRADE, req) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -145,7 +146,7 @@ func (b *BTCE) GetTransactionHistory(TIDFrom, Count, TIDEnd int64, order, since, err := b.SendAuthenticatedHTTPRequest(BTCE_TRANSACTION_HISTORY, req) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -164,7 +165,7 @@ func (b *BTCE) GetTradeHistory(TIDFrom, Count, TIDEnd int64, order, since, end, err := b.SendAuthenticatedHTTPRequest(BTCE_TRANSACTION_HISTORY, req) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -178,7 +179,7 @@ func (b *BTCE) SendAuthenticatedHTTPRequest(method string, values url.Values) (e hmac.Write([]byte(encoded)) if b.Verbose { - fmt.Printf("Sending POST request to %s calling method %s with params %s\n", BTCE_API_URL, method, encoded) + log.Printf("Sending POST request to %s calling method %s with params %s\n", BTCE_API_URL, method, encoded) } reqBody := strings.NewReader(encoded) @@ -202,7 +203,7 @@ func (b *BTCE) SendAuthenticatedHTTPRequest(method string, values url.Values) (e contents, _ := ioutil.ReadAll(resp.Body) if b.Verbose { - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) } resp.Body.Close() diff --git a/btcmarkets.go b/btcmarkets.go index 3fc836b5..e8fb508c 100644 --- a/btcmarkets.go +++ b/btcmarkets.go @@ -68,7 +68,7 @@ func (b *BTCMarkets) GetTicker(symbol string) (BTCMarketsTicker) { path := fmt.Sprintf("/market/%s/AUD/tick", symbol) err := SendHTTPRequest(BTCMARKETS_API_URL + path, true, &ticker) if err != nil { - fmt.Println(err) + log.Println(err) return BTCMarketsTicker{} } return ticker @@ -78,7 +78,7 @@ func (b *BTCMarkets) GetOrderbook(symbol string) { path := fmt.Sprintf("/market/%s/AUD/orderbook", symbol) err := SendHTTPRequest(BTCMARKETS_API_URL + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -91,7 +91,7 @@ func (b *BTCMarkets) GetTrades(symbol, since string) { } err := SendHTTPRequest(BTCMARKETS_API_URL + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } diff --git a/common.go b/common.go index 02cb892a..07ae01e4 100644 --- a/common.go +++ b/common.go @@ -2,11 +2,11 @@ package main import ( "net/http" - "fmt" "encoding/json" "io/ioutil" "errors" "math" + "log" ) func roundFloat(x float64, prec int) float64 { @@ -49,17 +49,17 @@ func SendHTTPRequest(url string, jsonDecode bool, result interface{}) (err error res, err := http.Get(url) if err != nil { - fmt.Println(err) + log.Println(err) return err } if res.StatusCode != 200 { - fmt.Printf("HTTP status code: %d", res.StatusCode) + log.Printf("HTTP status code: %d", res.StatusCode) return errors.New("Status code was not 200.") } contents, _ := ioutil.ReadAll(res.Body) - //fmt.Printf("Recieved raw: %s\n", string(contents)) + //log.Printf("Recieved raw: %s\n", string(contents)) if jsonDecode { err := json.Unmarshal(contents, &result) diff --git a/huobihttp.go b/huobihttp.go index 292f6e1b..ab66dffe 100644 --- a/huobihttp.go +++ b/huobihttp.go @@ -11,6 +11,7 @@ import ( "strconv" "time" "fmt" + "log" ) const ( @@ -73,7 +74,7 @@ func (h *HUOBI) GetTicker(symbol string) (HuobiTicker) { err := SendHTTPRequest(path, true, &resp) if err != nil { - fmt.Println(err) + log.Println(err) return HuobiTicker{} } return resp.Ticker @@ -83,7 +84,7 @@ func (h *HUOBI) GetOrderBook(symbol string) (bool) { path := fmt.Sprintf("http://market.huobi.com/staticmarket/depth_%s_json.js", symbol) err := SendHTTPRequest(path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -93,7 +94,7 @@ func (h *HUOBI) GetAccountInfo() { err := h.SendAuthenticatedRequest("get_account_info", url.Values{}) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -104,7 +105,7 @@ func (h *HUOBI) GetOrders(coinType int) { err := h.SendAuthenticatedRequest("get_orders", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -115,7 +116,7 @@ func (h *HUOBI) GetOrderInfo(orderID, coinType int) { err := h.SendAuthenticatedRequest("order_info", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -130,7 +131,7 @@ func (h *HUOBI) Trade(orderType string, coinType int, price, amount float64) { err := h.SendAuthenticatedRequest(orderType, values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -145,7 +146,7 @@ func (h *HUOBI) MarketTrade(orderType string, coinType int, price, amount float6 err := h.SendAuthenticatedRequest(orderType, values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -156,7 +157,7 @@ func (h *HUOBI) CancelOrder(orderID, coinType int) { err := h.SendAuthenticatedRequest("cancel_order", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -169,7 +170,7 @@ func (h *HUOBI) ModifyOrder(orderType string, coinType, orderID int, price, amou err := h.SendAuthenticatedRequest("modify_order", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -179,7 +180,7 @@ func (h *HUOBI) GetNewDealOrders(coinType int) { err := h.SendAuthenticatedRequest("get_new_deal_orders", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -190,7 +191,7 @@ func (h *HUOBI) GetOrderIDByTradeID(coinType, orderID int) { err := h.SendAuthenticatedRequest("get_order_id_by_trade_id", values) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -206,8 +207,8 @@ func (h *HUOBI) SendAuthenticatedRequest(method string, v url.Values) (error) { encoded := v.Encode() if h.Verbose { - fmt.Printf("Signature: %s\n", signature) - fmt.Printf("Sending POST request to %s with params %s\n", HUOBI_API_URL, encoded) + log.Printf("Signature: %s\n", signature) + log.Printf("Sending POST request to %s with params %s\n", HUOBI_API_URL, encoded) } reqBody := strings.NewReader(encoded) @@ -229,7 +230,7 @@ func (h *HUOBI) SendAuthenticatedRequest(method string, v url.Values) (error) { contents, _ := ioutil.ReadAll(resp.Body) if h.Verbose { - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) } resp.Body.Close() diff --git a/itbithttp.go b/itbithttp.go index ea42b3e8..0dced0ec 100644 --- a/itbithttp.go +++ b/itbithttp.go @@ -13,7 +13,6 @@ import ( "encoding/json" "io/ioutil" "log" - "fmt" ) const ( @@ -86,7 +85,7 @@ func (i *ItBit) GetTicker(currency string) (ItBitTicker) { var itbitTicker ItBitTicker err := SendHTTPRequest(path, true, &itbitTicker) if err != nil { - fmt.Println(err) + log.Println(err) return ItBitTicker{} } return itbitTicker @@ -96,7 +95,7 @@ func (i *ItBit) GetOrderbook(currency string) (bool) { path := ITBIT_API_URL + "/markets/" + currency + "/orders" err := SendHTTPRequest(path , true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -106,7 +105,7 @@ func (i *ItBit) GetTradeHistory(currency, timestamp string) (bool) { req := "/trades?since=" + timestamp err := SendHTTPRequest(ITBIT_API_URL + "markets/" + currency + req, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -122,7 +121,7 @@ func (i *ItBit) GetWallets(page int64, perPage int64, userID string) { err := i.SendAuthenticatedHTTPRequest("GET", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -131,7 +130,7 @@ func (i *ItBit) GetWallet(walletID string) { err := i.SendAuthenticatedHTTPRequest("GET", path, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -140,7 +139,7 @@ func (i *ItBit) GetWalletBalance(walletID, currency string) { err := i.SendAuthenticatedHTTPRequest("GET", path, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -155,7 +154,7 @@ func (i *ItBit) GetWalletTrades(walletID string, page int64, perPage int64, rang err := i.SendAuthenticatedHTTPRequest("GET", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -170,7 +169,7 @@ func (i *ItBit) GetWalletOrders(walletID string, instrument string, page int64, err := i.SendAuthenticatedHTTPRequest("GET", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -187,7 +186,7 @@ func (i *ItBit) PlaceWalletOrder(walletID, side, orderType, currency string, amo err := i.SendAuthenticatedHTTPRequest("POST", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -196,7 +195,7 @@ func (i *ItBit) GetWalletOrder(walletID, orderID string) { err := i.SendAuthenticatedHTTPRequest("GET", path, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -205,7 +204,7 @@ func (i *ItBit) CancelWalletOrder(walletID, orderID string) { err := i.SendAuthenticatedHTTPRequest("DELETE", path, nil) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -219,7 +218,7 @@ func (i *ItBit) PlaceWithdrawalRequest(walletID, currency, address string, amoun err := i.SendAuthenticatedHTTPRequest("POST", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -231,7 +230,7 @@ func (i *ItBit) GetDepositAddress(walletID, currency string) { err := i.SendAuthenticatedHTTPRequest("POST", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -246,7 +245,7 @@ func (i *ItBit) WalletTransfer(walletID, sourceWallet, destWallet string, amount err := i.SendAuthenticatedHTTPRequest("POST", path, params) if err != nil { - fmt.Println(err) + log.Println(err) } } diff --git a/lakebtchttp.go b/lakebtchttp.go index a96c25c9..c83cce14 100644 --- a/lakebtchttp.go +++ b/lakebtchttp.go @@ -12,7 +12,7 @@ import ( "strings" "time" "io/ioutil" - "fmt" + "log" ) const ( @@ -87,7 +87,7 @@ func (l *LakeBTC) GetTicker() (LakeBTCTickerResponse) { response := LakeBTCTickerResponse{} err := SendHTTPRequest(LAKEBTC_API_URL + LAKEBTC_TICKER, true, &response) if err != nil { - fmt.Println(err) + log.Println(err) return response } return response @@ -101,7 +101,7 @@ func (l *LakeBTC) GetOrderBook(currency string) (bool) { err := SendHTTPRequest(LAKEBTC_API_URL + req, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -110,7 +110,7 @@ func (l *LakeBTC) GetOrderBook(currency string) (bool) { func (l *LakeBTC) GetTradeHistory() (bool) { err := SendHTTPRequest(LAKEBTC_API_URL + LAKEBTC_TRADES, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -120,7 +120,7 @@ func (l *LakeBTC) GetAccountInfo() { err := l.SendAuthenticatedHTTPRequest(LAKEBTC_GET_ACCOUNT_INFO, "") if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -135,14 +135,14 @@ func (l *LakeBTC) Trade(orderType int, amount, price float64, currency string) { } if err != nil { - fmt.Println(err) + log.Println(err) } } func (l *LakeBTC) GetOrders() { err := l.SendAuthenticatedHTTPRequest(LAKEBTC_GET_ORDERS, "") if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -150,7 +150,7 @@ func (l *LakeBTC) CancelOrder(orderID int64) { params := strconv.FormatInt(orderID, 10) err := l.SendAuthenticatedHTTPRequest(LAKEBTC_CANCEL_ORDER, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -163,7 +163,7 @@ func (l *LakeBTC) GetTrades(timestamp time.Time) { err := l.SendAuthenticatedHTTPRequest(LAKEBTC_GET_TRADES, params) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -182,7 +182,7 @@ func (l *LakeBTC) SendAuthenticatedHTTPRequest(method, params string) (err error hmac.Write([]byte(encoded)) if l.Verbose { - fmt.Printf("Sending POST request to %s calling method %s with params %s\n", LAKEBTC_API_URL, method, encoded) + log.Printf("Sending POST request to %s calling method %s with params %s\n", LAKEBTC_API_URL, method, encoded) } reqBody := strings.NewReader(encoded) @@ -209,7 +209,7 @@ func (l *LakeBTC) SendAuthenticatedHTTPRequest(method, params string) (err error contents, _ := ioutil.ReadAll(resp.Body) if l.Verbose { - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) } resp.Body.Close() diff --git a/okcoinhttp.go b/okcoinhttp.go index 269a985f..33cdde81 100644 --- a/okcoinhttp.go +++ b/okcoinhttp.go @@ -10,6 +10,7 @@ import ( "io/ioutil" "strconv" "fmt" + "log" ) const ( @@ -103,7 +104,7 @@ func (o *OKCoin) GetTicker(symbol string) (OKCoinTicker) { err := SendHTTPRequest(o.APIUrl + path, true, &resp) if err != nil { - fmt.Println(err) + log.Println(err) return OKCoinTicker{} } return resp.Ticker @@ -114,7 +115,7 @@ func (o *OKCoin) GetFuturesTicker(symbol, contractType string) (OKCoinFuturesTic path := fmt.Sprintf("future_ticker.do?symbol=%s&contract_type=%s", symbol, contractType) err := SendHTTPRequest(o.APIUrl + path, true, &resp) if err != nil { - fmt.Println(err) + log.Println(err) return OKCoinFuturesTicker{} } return resp.Ticker @@ -124,7 +125,7 @@ func (o *OKCoin) GetOrderBook(symbol string) (bool) { path := "depth.do?symbol=" + symbol err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -134,7 +135,7 @@ func (o *OKCoin) GetFuturesDepth(symbol, contractType string) (bool) { path := fmt.Sprintf("future_depth.do?symbol=%s&contract_type=%s", symbol, contractType) err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -144,7 +145,7 @@ func (o *OKCoin) GetTradeHistory(symbol string) (bool) { path := "trades.do?symbol=" + symbol err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -154,7 +155,7 @@ func (o *OKCoin) GetFuturesTrades(symbol, contractType string) (bool) { path := fmt.Sprintf("future_trades.do?symbol=%s&contract_type=%s", symbol, contractType) err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -164,7 +165,7 @@ func (o *OKCoin) GetFuturesIndex(symbol string) (bool) { path := "future_index.do?symbol=" + symbol err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -173,7 +174,7 @@ func (o *OKCoin) GetFuturesIndex(symbol string) (bool) { func (o *OKCoin) GetFuturesExchangeRate() (bool) { err := SendHTTPRequest(o.APIUrl + "exchange_rate.do", true, nil) if err != nil { - fmt.Println(err) + log.Println(err) } return true } @@ -182,7 +183,7 @@ func (o *OKCoin) GetFuturesEstimatedPrice(symbol string) (bool) { path := "future_estimated_price.do?symbol=" + symbol err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -192,7 +193,7 @@ func (o *OKCoin) GetFuturesTradeHistory(symbol, date string, since int64) (bool) path := fmt.Sprintf("future_trades.do?symbol=%s&date%s&since=%d", symbol, date, since) err := SendHTTPRequest(o.APIUrl + path, true, nil) if err != nil { - fmt.Println(err) + log.Println(err) return false } return true @@ -204,7 +205,7 @@ func (o *OKCoin) GetUserInfo() { err := o.SendAuthenticatedHTTPRequest("userinfo.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -214,7 +215,7 @@ func (o *OKCoin) GetFuturesUserInfo() { err := o.SendAuthenticatedHTTPRequest("future_userinfo.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -226,7 +227,7 @@ func (o *OKCoin) GetFuturesPosition(symbol, contractType string) { err := o.SendAuthenticatedHTTPRequest("future_userinfo.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -241,7 +242,7 @@ func (o *OKCoin) Trade(amount, price float64, symbol, orderType string) { err := o.SendAuthenticatedHTTPRequest("trade.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -259,7 +260,7 @@ func (o *OKCoin) FuturesTrade(amount, price float64, matchPrice, leverage int64, err := o.SendAuthenticatedHTTPRequest("future_trade.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -273,7 +274,7 @@ func (o *OKCoin) BatchTrade(orderData string, symbol, orderType string) { err := o.SendAuthenticatedHTTPRequest("batch_trade.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -288,7 +289,7 @@ func (o *OKCoin) FuturesBatchTrade(orderData, symbol, contractType string, lever err := o.SendAuthenticatedHTTPRequest("future_batch_trade.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -301,7 +302,7 @@ func (o *OKCoin) CancelOrder(orderID int64, symbol string) { err := o.SendAuthenticatedHTTPRequest("cancel_order.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -315,7 +316,7 @@ func (o *OKCoin) CancelFuturesOrder(orderID int64, symbol, contractType string) err := o.SendAuthenticatedHTTPRequest("future_cancel.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -328,7 +329,7 @@ func (o *OKCoin) GetOrderInfo(orderID int64, symbol string) { err := o.SendAuthenticatedHTTPRequest("orders_info.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -345,7 +346,7 @@ func (o *OKCoin) GetFuturesOrderInfo(orderID, status, currentPage, pageLength in err := o.SendAuthenticatedHTTPRequest("future_order_info.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -359,7 +360,7 @@ func (o *OKCoin) GetOrdersInfo(orderID int64, orderType string, symbol string) { err := o.SendAuthenticatedHTTPRequest("orders_info.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -376,7 +377,7 @@ func (o *OKCoin) GetOrderHistory(orderID, pageLength, currentPage int64, orderTy err := o.SendAuthenticatedHTTPRequest("order_history.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -387,7 +388,7 @@ func (o *OKCoin) GetFuturesUserInfo4Fix() { err := o.SendAuthenticatedHTTPRequest("future_userinfo_4fix.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -401,7 +402,7 @@ func (o *OKCoin) GetFuturesUserPosition4Fix(symbol, contractType string) { err := o.SendAuthenticatedHTTPRequest("future_position_4fix.do", v) if err != nil { - fmt.Println(err) + log.Println(err) } } @@ -415,8 +416,8 @@ func (o *OKCoin) SendAuthenticatedHTTPRequest(method string, v url.Values) (err path := o.APIUrl + method if o.Verbose { - fmt.Printf("Signature: %s\n", signature) - fmt.Printf("Sending POST request to %s with params %s\n", path, encoded) + log.Printf("Signature: %s\n", signature) + log.Printf("Sending POST request to %s with params %s\n", path, encoded) } reqBody := strings.NewReader(encoded) @@ -438,7 +439,7 @@ func (o *OKCoin) SendAuthenticatedHTTPRequest(method string, v url.Values) (err contents, _ := ioutil.ReadAll(resp.Body) if o.Verbose { - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) } resp.Body.Close() diff --git a/smsglobal.go b/smsglobal.go index 94c65080..433d4ce6 100644 --- a/smsglobal.go +++ b/smsglobal.go @@ -4,7 +4,7 @@ import ( "net/http" "net/url" "strings" - "fmt" + "log" "io/ioutil" "errors" ) @@ -39,7 +39,7 @@ func SMSNotify(username, password, from, to, message string) (error) { } contents, _ := ioutil.ReadAll(resp.Body) - fmt.Printf("Recieved raw: %s\n", string(contents)) + log.Printf("Recieved raw: %s\n", string(contents)) resp.Body.Close() return nil } \ No newline at end of file