Merge pull request #108 from makerdao/sdk-699

Remove exchange services

src/config/ConfigFactory.js

@@ -21,7 +21,6 @@ const serviceRoles = [
   'allowance',
   'cdp',
   'conversion',
-  'exchange',
   'gas',
   'log',
   'price',

src/config/DefaultServiceProvider.js

@@ -10,8 +10,6 @@ import GasService from '../eth/GasService';
 import NonceService from '../eth/NonceService';
 import NullEventService from '../utils/events/NullEventService';
 import NullLogger from '../utils/loggers/NullLogger';
-import Eth2DaiDirect from '../exchanges/oasis/Eth2DaiDirect';
-import OasisExchangeService from '../exchanges/oasis/OasisExchangeService';
 import PriceService from '../eth/PriceService';
 import ServiceProvider from './ServiceProvider';
 import SmartContractService from '../eth/SmartContractService';
@@ -29,7 +27,6 @@ export const resolver = {
     cdp: 'EthereumCdpService',
     conversion: 'TokenConversionService',
     event: 'EventService',
-    // exchange: intentionally omitted
     gas: 'GasService',
     log: 'ConsoleLogger',
     nonce: 'NonceService',
@@ -66,15 +63,13 @@ export default class DefaultServiceProvider extends ServiceProvider {
         CacheService,
         ConsoleLogger,
         DSProxyService,
-        Eth2DaiDirect,
         EthereumCdpService,
         EthereumTokenService,
         EventService,
         GasService,
         NonceService,
         NullEventService,
         NullLogger,
-        OasisExchangeService,
         PriceService,
         SmartContractService,
         TimerService,

src/config/ServiceProvider.js

@@ -47,6 +47,11 @@ export default class ServiceProvider {
         instance = new service();
       } else {
         // string
+        if (!this.supports(service) && role === 'exchange') {
+          throw new Error(
+            'This service has been extracted from dai.js. Please refer to the documentation to add it as a plugin: \n\n https://github.com/makerdao/dai.js/wiki/Basic-Usage-(Plugins)'
+          );
+        }
         if (!this.supports(service)) {
           throw new Error('Unsupported service in configuration: ' + service);
         }

src/config/presets/browser.json

@@ -4,5 +4,5 @@
       "type": "BROWSER"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/http.json

@@ -4,5 +4,5 @@
       "type": "HTTP"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/inject.json

@@ -4,5 +4,5 @@
       "type": "INJECT"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/kovan.json

@@ -5,5 +5,5 @@
       "network": "kovan"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/mainnet.json

@@ -5,5 +5,5 @@
       "network": "mainnet"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/test.json

@@ -5,5 +5,5 @@
       "url": "http://localhost:2000"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }

src/config/presets/ws.json

@@ -4,5 +4,5 @@
       "type": "WEBSOCKET"
     }
   },
-  "exchange": "OasisExchangeService"
+  "cdp": true
 }