Merge branch 'bradrisse-master'

ccxt · May 31, 2018 · 8339e3b · 8339e3b
2 parents 66d903e + 8e2db3b
commit 8339e3b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 1 deletion.
diff --git a/js/base/errors.js b/js/base/errors.js
@@ -15,6 +15,7 @@ module.exports = subclass (
             'ExchangeError': {
                 'AuthenticationError': {
                     'PermissionDenied': {},
+                    'AccountSuspended': {},
                 },
                 'BadResponse': {
                     'NullResponse': {},

diff --git a/js/poloniex.js b/js/poloniex.js
@@ -3,7 +3,7 @@
 //  ---------------------------------------------------------------------------
 
 const Exchange = require ('./base/Exchange');
-const { ExchangeError, ExchangeNotAvailable, RequestTimeout, AuthenticationError, DDoSProtection, InsufficientFunds, OrderNotFound, OrderNotCached, InvalidOrder, CancelPending, InvalidNonce } = require ('./base/errors');
+const { ExchangeError, ExchangeNotAvailable, RequestTimeout, AuthenticationError, DDoSProtection, InsufficientFunds, OrderNotFound, OrderNotCached, InvalidOrder, AccountSuspended, CancelPending, InvalidNonce } = require ('./base/errors');
 
 //  ---------------------------------------------------------------------------
 
@@ -843,6 +843,8 @@ module.exports = class poloniex extends Exchange {
                 throw new DDoSProtection (feedback);
             } else if (error.indexOf ('Total must be at least') >= 0) {
                 throw new InvalidOrder (feedback);
+            } else if (error.indexOf('This account is frozen.') >= 0) {
+                throw new AccountSuspended (feedback);
             } else if (error.indexOf ('Not enough') >= 0) {
                 throw new InsufficientFunds (feedback);
             } else if (error.indexOf ('Nonce must be greater') >= 0) {

diff --git a/php/AccountSuspended.php b/php/AccountSuspended.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ccxt;
+
+class AccountSuspended extends AuthenticationError {
+
+}
diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py
@@ -42,6 +42,7 @@
 from ccxt.base.errors import NotSupported                   # noqa: F401
 from ccxt.base.errors import AuthenticationError            # noqa: F401
 from ccxt.base.errors import PermissionDenied               # noqa: F401
+from ccxt.base.errors import AccountSuspended               # noqa: F401
 from ccxt.base.errors import InvalidNonce                   # noqa: F401
 from ccxt.base.errors import InsufficientFunds              # noqa: F401
 from ccxt.base.errors import InvalidOrder                   # noqa: F401

diff --git a/python/ccxt/async/__init__.py b/python/ccxt/async/__init__.py
@@ -24,6 +24,7 @@
 from ccxt.base.errors import NotSupported                       # noqa: F401
 from ccxt.base.errors import AuthenticationError                # noqa: F401
 from ccxt.base.errors import PermissionDenied                   # noqa: F401
+from ccxt.base.errors import AccountSuspended                   # noqa: F401
 from ccxt.base.errors import InvalidNonce                       # noqa: F401
 from ccxt.base.errors import InsufficientFunds                  # noqa: F401
 from ccxt.base.errors import InvalidOrder                       # noqa: F401

diff --git a/python/ccxt/async/base/__init__.py b/python/ccxt/async/base/__init__.py
@@ -9,6 +9,7 @@
 from ccxt.base.errors import NotSupported          # noqa: F401
 from ccxt.base.errors import AuthenticationError   # noqa: F401
 from ccxt.base.errors import PermissionDenied      # noqa: F401
+from ccxt.base.errors import AccountSuspended      # noqa: F401
 from ccxt.base.errors import InvalidNonce          # noqa: F401
 from ccxt.base.errors import InsufficientFunds     # noqa: F401
 from ccxt.base.errors import InvalidOrder          # noqa: F401

diff --git a/python/ccxt/base/__init__.py b/python/ccxt/base/__init__.py
@@ -29,6 +29,7 @@
 from ccxt.base.errors import NotSupported          # noqa: F401
 from ccxt.base.errors import AuthenticationError   # noqa: F401
 from ccxt.base.errors import PermissionDenied      # noqa: F401
+from ccxt.base.errors import AccountSuspended      # noqa: F401
 from ccxt.base.errors import InvalidNonce          # noqa: F401
 from ccxt.base.errors import InsufficientFunds     # noqa: F401
 from ccxt.base.errors import InvalidOrder          # noqa: F401

diff --git a/python/ccxt/base/errors.py b/python/ccxt/base/errors.py
@@ -26,6 +26,7 @@
     'NotSupported',
     'AuthenticationError',
     'PermissionDenied',
+    'AccountSuspended',
     'InsufficientFunds',
     'InvalidOrder',
     'OrderNotFound',
@@ -78,6 +79,11 @@ class PermissionDenied(AuthenticationError):
     pass
 
 
+class AccountSuspended(AuthenticationError):
+    """Raised when user account has been suspended or deactivated by the exchange"""
+    pass
+
+
 class InsufficientFunds(ExchangeError):
     """Raised when you don't have enough currency on your account balance to place an order"""
     pass