removed old metainfo interface for python and PHP, fixed failing test…

…s, temporarily returned legacy number.js implementation (to be able to merge current work with the master branch and then continue re-working it)
toyan · Jan 21, 2018 · 28d611f · 28d611f
1 parent 38fcf19
commit 28d611f
Show file tree

Hide file tree

Showing 310 changed files with 2,325 additions and 2,326 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
diff --git a/doc/manual.rst b/doc/manual.rst
@@ -340,9 +340,11 @@ Here's an overview of base exchange properties with values added for example:
         },
         'version':         'v1',            // string ending with digits
         'api':             { ... },         // dictionary of api endpoints
-        'hasFetchTickers':  true,           // true if the exchange implements fetchTickers ()
-        'hasFetchOHLCV':    false,          // true if the exchange implements fetchOHLCV ()
-        'timeframes': {                     // empty if the exchange !hasFetchOHLCV
+        'has': {
+            'fetchTickers':  true,          // true if the exchange implements fetchTickers ()
+            'fetchOHLCV':    false,         // true if the exchange implements fetchOHLCV ()
+        },
+        'timeframes': {                     // empty if the exchange !has.fetchOHLCV
             '1m': '1minute',
             '1h': '1hour',
             '1d': '1day',
@@ -1157,7 +1159,7 @@ You can call the unified ``fetchOHLCV`` / ``fetch_ohlcv`` method to get the list
 
     // JavaScript
     let sleep = (ms) => new Promise (resolve => setTimeout (resolve, ms));
-    if (exchange.hasFetchOHLCV) {
+    if (exchange.has.fetchOHLCV) {
         (async () => {
             for (symbol in exchange.markets) {
                 await sleep (exchange.rateLimit) // milliseconds

diff --git a/examples/js/fetch-ticker-where-available.js b/examples/js/fetch-ticker-where-available.js
@@ -21,7 +21,7 @@ let printUsage = function () {
             let id = ccxt.exchanges[i]
 
             const exchange = new ccxt[id] ()
-            if (exchange.hasPublicAPI) {
+            if (exchange.has.publicAPI) {
 
                 try {
 

diff --git a/examples/js/search-all-exchanges.js b/examples/js/search-all-exchanges.js
@@ -51,7 +51,7 @@ const checkAgainst = strict ?
         // instantiate the exchange
         let exchange = new ccxt[id] ()
 
-        if (exchange.hasPublicAPI) {
+        if (exchange.has.publicAPI) {
 
             try {
 

diff --git a/js/base/Exchange.js b/js/base/Exchange.js
@@ -2,14 +2,7 @@
 
 /*  ------------------------------------------------------------------------ */
 
-<<<<<<< HEAD
 const functions = require ('./functions')
-=======
-const isNode    = (typeof window === 'undefined') && !(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
-    , functions = require ('./functions')
-    , throttle  = require ('./throttle')
-    , defaultFetch = isNode ? require ('fetch-ponyfill')().fetch : fetch
->>>>>>> master
     , Market    = require ('./Market')
 
 const { isNode
@@ -28,9 +21,9 @@ const { isNode
       , throttle
       , capitalize } = functions
 
-const { sleep
+const { now
+      , sleep
       , timeout
-      , time
       , TimedOut } = require ('./functions/time')
 
 const { ExchangeError
@@ -40,7 +33,7 @@ const { ExchangeError
       , RequestTimeout
       , ExchangeNotAvailable } = require ('./errors')
 
-const fetchImplementation = isNode ? require ('fetch-ponyfill')().fetch : fetch
+const defaultFetch = isNode ? require ('fetch-ponyfill')().fetch : fetch
 
 const journal = undefined // isNode && require ('./journal') // stub until we get a better solution for Webpack and React
 
@@ -95,9 +88,9 @@ module.exports = class Exchange {
 
         this.iso8601          = timestamp => new Date (timestamp).toISOString ()
         this.parse8601        = x => Date.parse (((x.indexOf ('+') >= 0) || (x.slice (-1) == 'Z')) ? x : (x + 'Z'))
-        this.milliseconds     = () => Math.floor (time.now ())
-        this.microseconds     = () => Math.floor (time.now () * 1000)
-        this.seconds          = () => Math.floor (time.now () / 1000)
+        this.milliseconds     = now
+        this.microseconds     = () => now () * 1000 // TODO: utilize performance.now for that purpose
+        this.seconds          = () => Math.floor (now () / 1000)
         this.id               = undefined
 
         // rate limiter settings

diff --git a/js/base/functions.js b/js/base/functions.js
@@ -11,38 +11,18 @@ const unCamelCasePropertyNames = x => {
 
 /*  ------------------------------------------------------------------------ */
 
-module.exports = unCamelCasePropertyNames ({
-
-    ...require ('./functions/platform'),
-    ...require ('./functions/generic'),
-    ...require ('./functions/string'),
-    ...require ('./functions/type'),
-    ...require ('./functions/number'),
-    ...require ('./functions/encode'),
-    ...require ('./functions/crypto'),
-    ...require ('./functions/time'),
-    ...require ('./functions/throttle'),
-
-/*  .............................................   */
-
-    json:   JSON.stringify,
-    unjson: JSON.parse,
-
-/*  .............................................   */
-
-    aggregate (bidasks) { 
-
-        let result = {}
-
-        for (const [price, volume] of bidasks) {
-            if (volume > 0)
-                result[price] = (result[price] || 0) + volume
-        }
-
-        return Object.keys (result)
-                     .map (price => [parseFloat (price),
-                                     parseFloat (result[price])])
-    }
-})
+module.exports = unCamelCasePropertyNames (Object.assign ({}
+
+    , require ('./functions/platform')
+    , require ('./functions/generic')
+    , require ('./functions/string')
+    , require ('./functions/type')
+    , require ('./functions/number')
+    , require ('./functions/encode')
+    , require ('./functions/crypto')
+    , require ('./functions/time')
+    , require ('./functions/throttle')
+    , require ('./functions/misc')
+))
 
 /*  ------------------------------------------------------------------------ */
diff --git a/js/base/functions/encode.js b/js/base/functions/encode.js
@@ -2,15 +2,19 @@
 
 /*  ------------------------------------------------------------------------ */
 
-const qs = require ('qs') // querystring (TODO: get rid of that dependency)
+const CryptoJS = require ('crypto-js')
+const qs       = require ('qs') // querystring (TODO: get rid of that dependency)
 
 /*  ------------------------------------------------------------------------ */
 
-module.exports = {
-
-    stringToBinary (str) {
+module.exports =
+
+    { json:   JSON.stringify
+    , unjson: JSON.parse
+
+    , stringToBinary (str) {
         const arr = new Uint8Array (str.length)
-        for (let i = 0; i < str.length; i++) { arr[i] = str.charCodeAt(i); }
+        for (let i = 0; i < str.length; i++) { arr[i] = str.charCodeAt (i); }
         return CryptoJS.lib.WordArray.create (arr)
     }
 

diff --git a/js/base/functions/misc.js b/js/base/functions/misc.js
@@ -0,0 +1,22 @@
+"use strict";
+
+/*  ------------------------------------------------------------------------ */
+
+module.exports = {
+
+    aggregate (bidasks) { 
+
+        let result = {}
+
+        for (const [price, volume] of bidasks) {
+            if (volume > 0)
+                result[price] = (result[price] || 0) + volume
+        }
+
+        return Object.keys (result)
+                    .map (price => [parseFloat (price),
+                                    parseFloat (result[price])])
+    }
+}
+
+/*  ------------------------------------------------------------------------ */