add token.addressOverrides to config

makerdao · Mar 23, 2020 · 21a7049 · 21a7049
1 parent 352367f
commit 21a7049
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/packages/dai/src/eth/EthereumTokenService.js b/packages/dai/src/eth/EthereumTokenService.js
@@ -24,6 +24,8 @@ export default class EthereumTokenService extends PrivateService {
         this._addedTokens[symbol] = [token];
       }
     }
+
+    this._addressOverrides = settings.addressOverrides || {};
   }
 
   getTokens() {
@@ -90,6 +92,7 @@ export default class EthereumTokenService extends PrivateService {
       ? tokenInfoList[version - 1]
       : tokenInfoList[tokenInfoList.length - 1];
 
+
     if (typeof tokenInfo.address === 'string') return tokenInfo;
 
     return {

diff --git a/packages/dai/test/eth/EthereumTokenService.spec.js b/packages/dai/test/eth/EthereumTokenService.spec.js
@@ -51,3 +51,21 @@ test('_getTokenInfo returns token address for current network', () => {
   const tokenInfo = ethereumTokenService._getTokenInfo('FOO');
   expect(tokenInfo).toEqual({ address: '0xtest' });
 });
+
+test('addressOverrides', async () => {
+  const service = buildTestEthereumTokenService({
+    token: {
+      addressOverrides: {
+        PETH: {
+          testnet: '0xmockpeth',
+          kovan: '0xmockpeth2'
+        },
+        WETH: '0xmockweth'
+      }
+    }
+  });
+  await service.manager().authenticate();
+
+  expect(service.getToken('PETH')._contract.address).toBe('0xmockpeth');
+  expect(service.getToken('WETH')._contract.address).toBe('0xmockweth');
+});
diff --git a/packages/dai/test/helpers/serviceBuilders.js b/packages/dai/test/helpers/serviceBuilders.js
@@ -57,20 +57,20 @@ export function buildTestService(name, settings = {}) {
 }
 
 export function buildTestEthereumCdpService(settings = {}) {
-  return buildTestService('cdp', { ...settings, cdp: true });
+  return buildTestService('cdp', { cdp: true, ...settings });
 }
 
 export function buildTestEthereumTokenService(settings = {}) {
-  return buildTestService('token', { ...settings, token: true });
+  return buildTestService('token', { token: true, ...settings });
 }
 
 export function buildTestSmartContractService(settings = {}) {
   return buildTestService('smartContract', {
-    ...settings,
-    smartContract: true
+    smartContract: true,
+    ...settings
   });
 }
 
 export function buildTestEventService(settings = {}) {
-  return buildTestService('event', { ...settings, event: true });
+  return buildTestService('event', { event: true, ...settings });
 }