[DataFeed] added interface for importing | fix test constructors

CoinAlpha · Dec 8, 2017 · 3f1c1b4 · 3f1c1b4
1 parent c1298cd
commit 3f1c1b4
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/contracts/DataFeed.sol b/contracts/DataFeed.sol
@@ -12,6 +12,11 @@ import "./jsmnsol/JsmnSolLib.sol";
  * @dev Generic Oraclize data feed contract for data feeds returning an unsigned integer.
  */
 
+contract IDataFeed {
+  uint    public value;                  // Total portfolio value in USD
+  uint    public usdEth;                 // USD/ETH exchange rate
+}
+
 contract DataFeed is usingOraclize, DestructibleModified {
   using SafeMath for uint;
   using JsmnSolLib for string;

diff --git a/contracts/Fund.sol b/contracts/Fund.sol
@@ -52,7 +52,7 @@ contract Fund is DestructiblePausable {
   // Modules: where possible, fund logic is delegated to the module contracts below, so that they can be patched and upgraded after contract deployment
   NavCalculator   public navCalculator;         // calculating net asset value
   InvestorActions public investorActions;       // performing investor actions such as subscriptions, redemptions, and withdrawals
-  DataFeed        public dataFeed;              // fetching external data like total portfolio value and exchange rates
+  IDataFeed       public dataFeed;              // fetching external data like total portfolio value and exchange rates
 
   // This struct tracks fund-related balances for a specific investor address
   struct Investor {
@@ -135,7 +135,7 @@ contract Fund is DestructiblePausable {
     exchange = _exchange;
     navCalculator = NavCalculator(_navCalculator);
     investorActions = InvestorActions(_investorActions);
-    dataFeed = DataFeed(_dataFeed);
+    dataFeed = IDataFeed(_dataFeed);
 
     // Set the initial net asset value calculation variables
     lastCalcDate = now;
@@ -560,7 +560,7 @@ contract Fund is DestructiblePausable {
   {
     require(_addr != address(0));
     address old = dataFeed;
-    dataFeed = DataFeed(_addr);
+    dataFeed = IDataFeed(_addr);
     LogDataFeedModuleChanged(old, _addr);
     return true;
   }

diff --git a/contracts/InvestorActions.sol b/contracts/InvestorActions.sol
@@ -22,7 +22,7 @@ contract InvestorActions is DestructibleModified {
   address public fundAddress;
 
   // Modules
-  DataFeed public dataFeed;
+  IDataFeed public dataFeed;
   Fund fund;
 
   // This modifier is applied to all external methods in this contract since only
@@ -36,7 +36,7 @@ contract InvestorActions is DestructibleModified {
     address _dataFeed
   )
   {
-    dataFeed = DataFeed(_dataFeed);
+    dataFeed = IDataFeed(_dataFeed);
   }
 
   // Modifies the max investment limit allowed for an investor and overwrites the past limit
@@ -253,7 +253,7 @@ contract InvestorActions is DestructibleModified {
     onlyOwner 
     returns (bool success)
   {
-    dataFeed = DataFeed(_address);
+    dataFeed = IDataFeed(_address);
     return true;
   }
 }
diff --git a/contracts/NavCalculator.sol b/contracts/NavCalculator.sol
@@ -23,7 +23,7 @@ contract NavCalculator is DestructibleModified {
   address public fundAddress;
 
   // Modules
-  DataFeed public dataFeed;
+  IDataFeed public dataFeed;
   Fund fund;
 
   // This modifier is applied to all external methods in this contract since only
@@ -35,7 +35,7 @@ contract NavCalculator is DestructibleModified {
 
   function NavCalculator(address _dataFeed)
   {
-    dataFeed = DataFeed(_dataFeed);
+    dataFeed = IDataFeed(_dataFeed);
   }
 
   event LogNavCalculation(
@@ -131,7 +131,7 @@ contract NavCalculator is DestructibleModified {
   function setDataFeed(address _address)
     onlyOwner
   {
-    dataFeed = DataFeed(_address);
+    dataFeed = IDataFeed(_address);
   }
 
   // ********* HELPERS *********

diff --git a/test/3_initialize_fund.js b/test/3_initialize_fund.js
@@ -24,7 +24,12 @@ contract('Initialize Fund', (accounts) => {
   const EXCHANGE = accounts[1];
   const INITIAL_NAV = web3.toWei(1, 'ether');
 
-  const USD_ETH = 300;
+  const GAS_AMT = 500000;
+  const USD_ETH_EXCHANGE_RATE = 450;
+  const USD_BTC_EXCHANGE_RATE = 10000;
+  const USD_LTC_EXCHANGE_RATE = 100;
+  const SECONDS_BETWEEN_QUERIES = 300;
+
   const MIN_INITIAL_SUBSCRIPTION = 20;
   const INVESTOR_ALLOCATION = 21;
   const MIN_SUBSCRIPTION = 5;
@@ -42,8 +47,10 @@ contract('Initialize Fund', (accounts) => {
   before(() => DataFeed.new(
     false,                                  // _useOraclize
     '[NOT USED]',                           // _queryUrl
-    300,                                    // _secondsBetweenQueries
-    USD_ETH * 100,                          // _initialExchangeRate
+    SECONDS_BETWEEN_QUERIES,                // _secondsBetweenQueries
+    USD_ETH_EXCHANGE_RATE * 100,            // _initialUsdEthRate
+    USD_BTC_EXCHANGE_RATE * 100,            // _initialUsdBtcRate
+    USD_LTC_EXCHANGE_RATE * 100,            // _initialUsdLtcRate
     EXCHANGE,                               // _exchange
     { from: OWNER, value: 0 }
   )

diff --git a/test/4_fund_actions.js b/test/4_fund_actions.js
@@ -33,7 +33,11 @@ contract('Fund Actions', (accounts) => {
 
   // test parameters
   const GAS_AMT = 500000;
-  const USD_ETH = 300;
+  const USD_ETH_EXCHANGE_RATE = 450;
+  const USD_BTC_EXCHANGE_RATE = 10000;
+  const USD_LTC_EXCHANGE_RATE = 100;
+  const SECONDS_BETWEEN_QUERIES = 300;
+
   const MIN_INITIAL_SUBSCRIPTION = 20;
   const INVESTOR_ALLOCATION = 21;
   const MIN_SUBSCRIPTION = 5;
@@ -61,8 +65,10 @@ contract('Fund Actions', (accounts) => {
   before(() => DataFeed.new(
     false,                                  // _useOraclize
     '[NOT USED]',                           // _queryUrl
-    USD_ETH * 100,                          // _secondsBetweenQueries
-    30000,                                  // _initialExchangeRate
+    SECONDS_BETWEEN_QUERIES,                // _secondsBetweenQueries
+    USD_ETH_EXCHANGE_RATE * 100,            // _initialUsdEthRate
+    USD_BTC_EXCHANGE_RATE * 100,            // _initialUsdBtcRate
+    USD_LTC_EXCHANGE_RATE * 100,            // _initialUsdLtcRate
     EXCHANGE,                               // _exchange
     { from: OWNER, value: 0 }
   )