Rename PollingDelay variable to RESTPollingDelay for greater clarity.

2026-05-20 07:26:46 +00:00 · 2015-04-23 18:25:01 +10:00
parent bb09108702
commit 94f9552594
15 changed files with 75 additions and 75 deletions
--- a/bitfinexhttp.go
+++ b/bitfinexhttp.go
@@ -145,7 +145,7 @@ type Bitfinex struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APIKey, APISecret string
 	Ticker BitfinexTicker
 	Stats []BitfinexStats
@@ -162,7 +162,7 @@ func (b *Bitfinex) SetDefaults() {
 	b.Enabled = true
 	b.Verbose = false
 	b.Websocket = false
-	b.PollingDelay = 10
+	b.RESTPollingDelay = 10
 }

 func (b *Bitfinex) GetName() (string) {
@@ -184,7 +184,7 @@ func (b *Bitfinex) SetAPIKeys(apiKey, apiSecret string) {

 func (b *Bitfinex) Run() {
 	if b.Verbose {
-		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.RESTPollingDelay)
 	}

 	b.GetAccountFeeInfo()
@@ -202,7 +202,7 @@ func (b *Bitfinex) Run() {
 			log.Printf("Bitfinex BTC: Last %f High %f Low %f Volume %f\n", BitfinexBTC.Last, BitfinexBTC.High, BitfinexBTC.Low, BitfinexBTC.Volume)
 			AddExchangeInfo(b.GetName(), "BTC", BitfinexBTC.Last, BitfinexBTC.Volume)
 		}()
-		time.Sleep(time.Second * b.PollingDelay)
+		time.Sleep(time.Second * b.RESTPollingDelay)
 	}
 }

--- a/bitstamphttp.go
+++ b/bitstamphttp.go
@@ -35,7 +35,7 @@ type Bitstamp struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	ClientID, APIKey, APISecret string
 	Ticker BitstampTicker
 	Orderbook Orderbook
@@ -86,7 +86,7 @@ func (b *Bitstamp) SetDefaults() {
 	b.Enabled = true
 	b.Verbose = false
 	b.Websocket = false
-	b.PollingDelay = 10
+	b.RESTPollingDelay = 10
 }

 func (b *Bitstamp) GetName() (string) {
@@ -114,7 +114,7 @@ func (b *Bitstamp) SetAPIKeys(clientID, apiKey, apiSecret string) {
 func (b *Bitstamp) Run() {
 	if b.Verbose {
 		log.Printf("%s Websocket: %s.", b.GetName(), IsEnabled(b.Websocket))
-		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.RESTPollingDelay)
 	}

 	b.GetBalance()
@@ -129,7 +129,7 @@ func (b *Bitstamp) Run() {
 			log.Printf("Bitstamp BTC: Last %f High %f Low %f Volume %f\n", BitstampBTC.Last, BitstampBTC.High, BitstampBTC.Low, BitstampBTC.Volume)
 			AddExchangeInfo(b.GetName(), "BTC", BitstampBTC.Last, BitstampBTC.Volume)
 		}()
-		time.Sleep(time.Second * b.PollingDelay)
+		time.Sleep(time.Second * b.RESTPollingDelay)
 	}
 }

--- a/btcchinahttp.go
+++ b/btcchinahttp.go
@@ -43,7 +43,7 @@ type BTCChina struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APISecret, APIKey string
 	Fee float64
 }
@@ -174,7 +174,7 @@ func (b *BTCChina) SetDefaults() {
 	b.Fee = 0
 	b.Verbose = false
 	b.Websocket = false
-	b.PollingDelay = 10
+	b.RESTPollingDelay = 10
 }

 func (b *BTCChina) GetName() (string) {
@@ -200,7 +200,7 @@ func (b *BTCChina) GetFee() (float64) {

 func (b *BTCChina) Run() {
 	if b.Verbose {
-		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.RESTPollingDelay)
 	}

 	if b.Websocket {
@@ -225,7 +225,7 @@ func (b *BTCChina) Run() {
 			log.Printf("BTCChina LTC: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", BTCChinaLTCLastUSD, BTCChinaLTC.Last, BTCChinaLTCHighUSD, BTCChinaLTC.High, BTCChinaLTCLowUSD, BTCChinaLTC.Low, BTCChinaLTC.Vol)
 			AddExchangeInfo(b.GetName(), "LTC", BTCChinaLTCLastUSD, BTCChinaLTC.Vol)
 		}()
-		time.Sleep(time.Second * b.PollingDelay)
+		time.Sleep(time.Second * b.RESTPollingDelay)
 	}
 }

--- a/btcehttp.go
+++ b/btcehttp.go
@@ -31,7 +31,7 @@ type BTCE struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APIKey, APISecret string
 	Fee float64
 }
@@ -67,7 +67,7 @@ func (b *BTCE) SetDefaults() {
 	b.Fee = 0.2
 	b.Verbose = false
 	b.Websocket = false
-	b.PollingDelay = 10
+	b.RESTPollingDelay = 10
 }

 func (b *BTCE) GetName() (string) {
@@ -93,7 +93,7 @@ func (b *BTCE) GetFee() (float64) {

 func (b *BTCE) Run() {
 	if b.Verbose {
-		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.RESTPollingDelay)
 	}

 	for b.Enabled {
@@ -108,7 +108,7 @@ func (b *BTCE) Run() {
 			log.Printf("BTC-e LTC: Last %f High %f Low %f Volume %f\n", BTCeLTC.Last, BTCeLTC.High, BTCeLTC.Low, BTCeLTC.Vol_cur)
 			AddExchangeInfo(b.GetName(), "LTC", BTCeLTC.Last, BTCeLTC.Vol_cur)
 		}()
-		time.Sleep(time.Second * b.PollingDelay)
+		time.Sleep(time.Second * b.RESTPollingDelay)
 	}
 }

--- a/btcmarkets.go
+++ b/btcmarkets.go
@@ -18,7 +18,7 @@ type BTCMarkets struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	Fee float64
 	APIKey, APISecret string
 }
@@ -38,7 +38,7 @@ func (b *BTCMarkets) SetDefaults() {
 	b.Fee = 0.85
 	b.Verbose = false
 	b.Websocket = false
-	b.PollingDelay = 10
+	b.RESTPollingDelay = 10
 }

 func (b *BTCMarkets) GetName() (string) {
@@ -64,7 +64,7 @@ func (b *BTCMarkets) GetFee() (float64) {

 func (b *BTCMarkets) Run() {
 	if b.Verbose {
-		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", b.GetName(), b.RESTPollingDelay)
 	}
 	
 	for b.Enabled {
@@ -85,7 +85,7 @@ func (b *BTCMarkets) Run() {
 			log.Printf("BTC Markets LTC: Last %f (%f) Bid %f (%f) Ask %f (%f)", BTCMarketsLTCLastUSD, BTCMarketsLTC.LastPrice, BTCMarketsLTCBestBidUSD, BTCMarketsLTC.BestBID, BTCMarketsLTCBestAskUSD, BTCMarketsLTC.BestAsk)
 			AddExchangeInfo(b.GetName(), "LTC", BTCMarketsLTCLastUSD, 0)
 		}()
-		time.Sleep(time.Second * b.PollingDelay)
+		time.Sleep(time.Second * b.RESTPollingDelay)
 	}
 }

--- a/coinbase.go
+++ b/coinbase.go
@@ -25,7 +25,7 @@ type Coinbase struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	Password, APIKey, APISecret string
 	TakerFee, MakerFee float64
 }
@@ -91,7 +91,7 @@ func (c *Coinbase) SetDefaults() {
 	c.MakerFee = 0
 	c.Verbose = false
 	c.Websocket = false
-	c.PollingDelay = 10
+	c.RESTPollingDelay = 10
 }

 func (c *Coinbase) GetName() (string) {
@@ -117,7 +117,7 @@ func (c *Coinbase) GetFee(maker bool) (float64) {
 func (c *Coinbase) Run() {
 	if c.Verbose {
 		log.Printf("%s Websocket: %s. (url: %s).\n", c.GetName(), IsEnabled(c.Websocket), COINBASE_WEBSOCKET_URL)
-		log.Printf("%s polling delay: %ds.\n", c.GetName(), c.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", c.GetName(), c.RESTPollingDelay)
 	}

 	if c.Websocket {
@@ -131,7 +131,7 @@ func (c *Coinbase) Run() {
 			log.Printf("Coinbase BTC: Last %f High %f Low %f Volume %f\n", CoinbaseTicker.Price, CoinbaseStats.High, CoinbaseStats.Low, CoinbaseStats.Volume)
 			AddExchangeInfo(c.GetName(), "BTC", CoinbaseTicker.Price, CoinbaseStats.Volume)
 		}()
-		time.Sleep(time.Second * c.PollingDelay)
+		time.Sleep(time.Second * c.RESTPollingDelay)
 	}
 }

--- a/config.go
+++ b/config.go
@@ -29,7 +29,7 @@ type Exchanges struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APIKey string
 	APISecret string
 	ClientID string
--- a/config_example.json
+++ b/config_example.json
@@ -19,7 +19,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "Bitstamp",
@@ -31,7 +31,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "BTC China",
@@ -42,7 +42,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "BTCE",
@@ -53,7 +53,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "BTC Markets",
@@ -64,7 +64,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "Coinbase",
@@ -76,7 +76,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "Cryptsy",
@@ -88,7 +88,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "Huobi",
@@ -99,7 +99,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "ITBIT",
@@ -110,7 +110,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "Kraken",
@@ -121,7 +121,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": false,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "LakeBTC",
@@ -132,7 +132,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "OKCOIN China",
@@ -143,7 +143,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    },
    {
      "Name": "OKCOIN International",
@@ -154,7 +154,7 @@
      "Enabled": true,
      "Verbose": false,
      "Websocket": true,
-      "PollingDelay": 10
+      "RESTPollingDelay": 10
    }
  ]
 }
--- a/cryptsyhttp.go
+++ b/cryptsyhttp.go
@@ -35,7 +35,7 @@ type Cryptsy struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APIKey, APISecret string
 	TakerFee, MakerFee float64
 }
@@ -132,7 +132,7 @@ func (c *Cryptsy) SetDefaults() {
 	c.TakerFee = 0.33
 	c.MakerFee = 0.33
 	c.Verbose = false
-	c.PollingDelay = 10
+	c.RESTPollingDelay = 10
 }

 func (c *Cryptsy) GetName() (string) {
@@ -158,7 +158,7 @@ func (c *Cryptsy) GetFee(maker bool) (float64) {
 func (c *Cryptsy) Run() {
 	if c.Verbose {
 		log.Printf("%s Websocket: %s.", c.GetName(), IsEnabled(c.Websocket))
-		log.Printf("%s polling delay: %ds.\n", c.GetName(), c.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", c.GetName(), c.RESTPollingDelay)
 	}

 	if c.Websocket {
@@ -176,7 +176,7 @@ func (c *Cryptsy) Run() {
 			log.Printf("Cryptsy LTC: Last %f High %f Low %f Volume %f\n", CryptsyLTC[0].LastTrade.Price, CryptsyLTC[0].DayStats.PriceHigh, CryptsyLTC[0].DayStats.PriceLow, CryptsyLTC[0].DayStats.Volume)
 			AddExchangeInfo(c.GetName(), "LTC", CryptsyLTC[0].LastTrade.Price, CryptsyLTC[0].DayStats.Volume)
 		}()
-		time.Sleep(time.Second * c.PollingDelay)
+		time.Sleep(time.Second * c.RESTPollingDelay)
 	}
 }

--- a/huobihttp.go
+++ b/huobihttp.go
@@ -19,7 +19,7 @@ type HUOBI struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	AccessKey, SecretKey string
 	Fee float64
 }
@@ -44,7 +44,7 @@ func (h *HUOBI) SetDefaults() {
 	h.Fee = 0
 	h.Verbose = false
 	h.Websocket = false
-	h.PollingDelay = 10
+	h.RESTPollingDelay = 10
 }

 func (h *HUOBI) GetName() (string) {
@@ -71,7 +71,7 @@ func (h *HUOBI) GetFee() (float64) {
 func (h *HUOBI) Run() {
 	if h.Verbose {
 		log.Printf("%s Websocket: %s (url: %s).\n", h.GetName(), IsEnabled(h.Websocket), HUOBI_SOCKETIO_ADDRESS)
-		log.Printf("%s polling delay: %ds.\n", h.GetName(), h.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", h.GetName(), h.RESTPollingDelay)
 	}

 	if h.Websocket {
@@ -96,7 +96,7 @@ func (h *HUOBI) Run() {
 			log.Printf("Huobi LTC: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", HuobiLTCLastUSD, HuobiLTC.Last, HuobiLTCHighUSD, HuobiLTC.High, HuobiLTCLowUSD, HuobiLTC.Low, HuobiLTC.Vol)
 			AddExchangeInfo(h.GetName(), "LTC", HuobiLTCLastUSD, HuobiLTC.Vol)
 		}()
-		time.Sleep(time.Second * h.PollingDelay)
+		time.Sleep(time.Second * h.RESTPollingDelay)
 	}
 }

--- a/itbithttp.go
+++ b/itbithttp.go
@@ -19,7 +19,7 @@ type ItBit struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	ClientKey, APISecret, UserID string
 	MakerFee, TakerFee float64
 }
@@ -51,7 +51,7 @@ func (i *ItBit) SetDefaults() {
 	i.TakerFee = 0.50
 	i.Verbose = false
 	i.Websocket = false
-	i.PollingDelay =  10
+	i.RESTPollingDelay =  10
 }

 func (i *ItBit) GetName() (string) {
@@ -81,7 +81,7 @@ func (i *ItBit) GetFee(maker bool) (float64) {

 func (i *ItBit) Run() {
 	if i.Verbose {
-		log.Printf("%s polling delay: %ds.\n", i.GetName(), i.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", i.GetName(), i.RESTPollingDelay)
 	}
 	for i.Enabled {
 		go func() {
@@ -89,7 +89,7 @@ func (i *ItBit) Run() {
 			log.Printf("ItBit BTC: Last %f High %f Low %f Volume %f\n", ItbitBTC.LastPrice, ItbitBTC.High24h, ItbitBTC.Low24h, ItbitBTC.Volume24h)
 			AddExchangeInfo(i.GetName(), "BTC", ItbitBTC.LastPrice, ItbitBTC.Volume24h)
 		}()
-		time.Sleep(time.Second * i.PollingDelay)
+		time.Sleep(time.Second * i.RESTPollingDelay)
 	}
 }

--- a/kraken.go
+++ b/kraken.go
@@ -41,7 +41,7 @@ type Kraken struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	ClientKey, APISecret string
 	FiatFee, CryptoFee float64
 }
@@ -58,7 +58,7 @@ func (k *Kraken) SetDefaults() {
 	k.CryptoFee = 0.10
 	k.Verbose = false
 	k.Websocket = false
-	k.PollingDelay = 10
+	k.RESTPollingDelay = 10
 }

 func (k *Kraken) GetName() (string) {
@@ -88,7 +88,7 @@ func (k *Kraken) GetFee(cryptoTrade bool) (float64) {

 func (k *Kraken) Run() {
 	if k.Verbose {
-		log.Printf("%s polling delay: %ds.\n", k.GetName(), k.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", k.GetName(), k.RESTPollingDelay)
 	}

 	for k.Enabled {
@@ -100,7 +100,7 @@ func (k *Kraken) Run() {
 			KrakenLTC := k.GetTicker("LTCUSD")
 			log.Printf("Kraken LTC: %v\n", KrakenLTC)
 		}()
-		time.Sleep(time.Second * k.PollingDelay)
+		time.Sleep(time.Second * k.RESTPollingDelay)
 	}
 }

--- a/lakebtchttp.go
+++ b/lakebtchttp.go
@@ -29,7 +29,7 @@ type LakeBTC struct {
 	Enabled bool
 	Verbose bool
 	Websocket bool
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	Email, APISecret string
 	TakerFee, MakerFee float64
 }
@@ -60,7 +60,7 @@ func (l *LakeBTC) SetDefaults() {
 	l.MakerFee = 0.15
 	l.Verbose = false
 	l.Websocket = false
-	l.PollingDelay = 10
+	l.RESTPollingDelay = 10
 }

 func (l *LakeBTC) GetName() (string) {
@@ -91,7 +91,7 @@ func (l *LakeBTC) GetFee(maker bool) (float64) {
 func (l *LakeBTC) Run() {
 	if l.Verbose {
 		log.Printf("%s Websocket: %s. (url: %s).\n", l.GetName(), IsEnabled(l.Websocket), LAKEBTC_WEBSOCKET_URL)
-		log.Printf("%s polling delay: %ds.\n", l.GetName(), l.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", l.GetName(), l.RESTPollingDelay)
 	}

 	if l.Websocket {
@@ -104,7 +104,7 @@ func (l *LakeBTC) Run() {
 			log.Printf("LakeBTC USD: Last %f (%f) High %f (%f) Low %f (%f) Volume US %f (CNY %f)\n", LakeBTCTickerResponse.USD.Last, LakeBTCTickerResponse.CNY.Last, LakeBTCTickerResponse.USD.High, LakeBTCTickerResponse.CNY.High, LakeBTCTickerResponse.USD.Low, LakeBTCTickerResponse.CNY.Low, LakeBTCTickerResponse.USD.Volume, LakeBTCTickerResponse.CNY.Volume)
 			AddExchangeInfo(l.GetName(), "BTC", LakeBTCTickerResponse.USD.Last, LakeBTCTickerResponse.USD.Volume)
 		}()
-		time.Sleep(time.Second * l.PollingDelay)
+		time.Sleep(time.Second * l.RESTPollingDelay)
 	}
 }

--- a/main.go
+++ b/main.go
@@ -111,7 +111,7 @@ func main() {
 				bot.exchange.btcchina.SetEnabled(false)
 			} else {
 				bot.exchange.btcchina.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.btcchina.PollingDelay = exch.PollingDelay
+				bot.exchange.btcchina.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.btcchina.Verbose = exch.Verbose
 				bot.exchange.btcchina.Websocket = exch.Websocket
 				go bot.exchange.btcchina.Run()
@@ -122,7 +122,7 @@ func main() {
 				bot.exchange.bitstamp.SetEnabled(false)
 			} else {
 				bot.exchange.bitstamp.SetAPIKeys(exch.ClientID, exch.APIKey, exch.APISecret)
-				bot.exchange.bitstamp.PollingDelay = exch.PollingDelay
+				bot.exchange.bitstamp.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.bitstamp.Verbose = exch.Verbose
 				bot.exchange.bitstamp.Websocket = exch.Websocket
 				go bot.exchange.bitstamp.Run()
@@ -133,7 +133,7 @@ func main() {
 				bot.exchange.bitfinex.SetEnabled(false)
 			} else {
 				bot.exchange.bitfinex.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.bitfinex.PollingDelay = exch.PollingDelay
+				bot.exchange.bitfinex.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.bitfinex.Verbose = exch.Verbose
 				bot.exchange.bitfinex.Websocket = exch.Websocket
 				go bot.exchange.bitfinex.Run()
@@ -144,7 +144,7 @@ func main() {
 				bot.exchange.btce.SetEnabled(false)
 			} else {
 				bot.exchange.btce.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.btce.PollingDelay = exch.PollingDelay
+				bot.exchange.btce.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.btce.Verbose = exch.Verbose
 				bot.exchange.btce.Websocket = exch.Websocket
 				go bot.exchange.btce.Run()
@@ -155,7 +155,7 @@ func main() {
 				bot.exchange.btcmarkets.SetEnabled(false)
 			} else {
 				bot.exchange.btcmarkets.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.btcmarkets.PollingDelay = exch.PollingDelay
+				bot.exchange.btcmarkets.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.btcmarkets.Verbose = exch.Verbose
 				bot.exchange.btcmarkets.Websocket = exch.Websocket
 				go bot.exchange.btcmarkets.Run()
@@ -166,7 +166,7 @@ func main() {
 				bot.exchange.coinbase.SetEnabled(false)
 			} else {
 				bot.exchange.coinbase.SetAPIKeys(exch.ClientID, exch.APIKey, exch.APISecret)
-				bot.exchange.coinbase.PollingDelay = exch.PollingDelay
+				bot.exchange.coinbase.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.coinbase.Verbose = exch.Verbose
 				bot.exchange.coinbase.Websocket = exch.Websocket
 				go bot.exchange.coinbase.Run()
@@ -177,7 +177,7 @@ func main() {
 				bot.exchange.cryptsy.SetEnabled(false)
 			} else {
 				bot.exchange.cryptsy.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.cryptsy.PollingDelay = exch.PollingDelay
+				bot.exchange.cryptsy.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.cryptsy.Verbose = exch.Verbose
 				bot.exchange.cryptsy.Websocket = exch.Websocket
 				go bot.exchange.cryptsy.Run()
@@ -188,7 +188,7 @@ func main() {
 				bot.exchange.okcoinChina.SetEnabled(false)
 			} else {
 				bot.exchange.okcoinChina.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.okcoinChina.PollingDelay = exch.PollingDelay
+				bot.exchange.okcoinChina.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.okcoinChina.Verbose = exch.Verbose
 				bot.exchange.okcoinChina.Websocket = exch.Websocket
 				go bot.exchange.okcoinChina.Run()
@@ -199,7 +199,7 @@ func main() {
 				bot.exchange.okcoinIntl.SetEnabled(false)
 			} else {
 				bot.exchange.okcoinIntl.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.okcoinIntl.PollingDelay = exch.PollingDelay
+				bot.exchange.okcoinIntl.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.okcoinIntl.Verbose = exch.Verbose
 				bot.exchange.okcoinIntl.Websocket = exch.Websocket
 				go bot.exchange.okcoinIntl.Run()
@@ -210,7 +210,7 @@ func main() {
 				bot.exchange.itbit.SetEnabled(false)
 			} else {
 				bot.exchange.itbit.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.itbit.PollingDelay = exch.PollingDelay
+				bot.exchange.itbit.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.itbit.Verbose = exch.Verbose
 				bot.exchange.itbit.Websocket = exch.Websocket
 				go bot.exchange.itbit.Run()
@@ -221,7 +221,7 @@ func main() {
 				bot.exchange.kraken.SetEnabled(false)
 			} else {
 				bot.exchange.kraken.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.kraken.PollingDelay = exch.PollingDelay
+				bot.exchange.kraken.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.kraken.Verbose = exch.Verbose
 				bot.exchange.kraken.Websocket = exch.Websocket
 				go bot.exchange.kraken.Run()
@@ -232,7 +232,7 @@ func main() {
 				bot.exchange.lakebtc.SetEnabled(false)
 			} else {
 				bot.exchange.lakebtc.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.lakebtc.PollingDelay = exch.PollingDelay
+				bot.exchange.lakebtc.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.lakebtc.Verbose = exch.Verbose
 				bot.exchange.lakebtc.Websocket = exch.Websocket
 				go bot.exchange.lakebtc.Run()
@@ -243,7 +243,7 @@ func main() {
 				bot.exchange.huobi.SetEnabled(false)
 			} else {
 				bot.exchange.huobi.SetAPIKeys(exch.APIKey, exch.APISecret)
-				bot.exchange.huobi.PollingDelay = exch.PollingDelay
+				bot.exchange.huobi.RESTPollingDelay = exch.RESTPollingDelay
 				bot.exchange.huobi.Verbose = exch.Verbose
 				bot.exchange.huobi.Websocket = exch.Websocket
 				go bot.exchange.huobi.Run()
--- a/okcoinhttp.go
+++ b/okcoinhttp.go
@@ -23,7 +23,7 @@ type OKCoin struct {
 	Verbose bool
 	Websocket bool
 	WebsocketURL string
-	PollingDelay time.Duration
+	RESTPollingDelay time.Duration
 	APIUrl, PartnerID, SecretKey string
 	TakerFee, MakerFee float64
 	RESTErrors map[string]string
@@ -153,7 +153,7 @@ func (o *OKCoin) SetDefaults() {
 	o.Enabled = true
 	o.Verbose = false
 	o.Websocket = false
-	o.PollingDelay = 10
+	o.RESTPollingDelay = 10
 }

 func (o *OKCoin) GetName() (string) {
@@ -192,7 +192,7 @@ func (o *OKCoin) GetFee(maker bool) (float64) {
 func (o *OKCoin) Run() {
 	if o.Verbose {
 		log.Printf("%s Websocket: %s. (url: %s).\n", o.GetName(), IsEnabled(o.Websocket), o.WebsocketURL)
-		log.Printf("%s polling delay: %ds.\n", o.GetName(), o.PollingDelay)
+		log.Printf("%s polling delay: %ds.\n", o.GetName(), o.RESTPollingDelay)
 	}

 	if o.Websocket {
@@ -265,7 +265,7 @@ func (o *OKCoin) Run() {
 				AddExchangeInfo(o.GetName(), "LTC",OKCoinChinaLTCLastUSD, OKCoinChinaLTC.Vol)
 			}()
 		}
-		time.Sleep(time.Second * o.PollingDelay)
+		time.Sleep(time.Second * o.RESTPollingDelay)
 	}
 }