fix tests

contracts/PolicyImpl.sol

@@ -110,9 +110,7 @@ contract PolicyImpl is EternalStorage, Controller, IProxyImpl, IPolicyImpl, IPol
     uint256 assetManagerCommissionBP_,
     uint256 naymsCommissionBP_,
     uint256 numTranches_,
-    uint256 state_,
-    uint256 numClaims_,
-    uint256 numPendingClaims_
+    uint256 state_
   ) {
     initiationDate_ = dataUint256["initiationDate"];
     startDate_ = dataUint256["startDate"];
@@ -124,6 +122,12 @@ contract PolicyImpl is EternalStorage, Controller, IProxyImpl, IPolicyImpl, IPol
     naymsCommissionBP_ = dataUint256["naymsCommissionBP"];
     numTranches_ = dataUint256["numTranches"];
     state_ = dataUint256["state"];
+  }
+
+  function getClaimStats() public view returns (
+    uint256 numClaims_,
+    uint256 numPendingClaims_
+  ) {
     numClaims_ = dataUint256["claimsCount"];
     numPendingClaims_ = dataUint256["claimsPendingCount"];
   }
@@ -184,12 +188,12 @@ contract PolicyImpl is EternalStorage, Controller, IProxyImpl, IPolicyImpl, IPol
   }
 
   function getCommissionBalances() public view returns (
-    uint256 assetManagerCommissionBalance_,
     uint256 brokerCommissionBalance_,
+    uint256 assetManagerCommissionBalance_,
     uint256 naymsCommissionBalance_
   ) {
-    assetManagerCommissionBalance_ = dataUint256["assetManagerCommissionBalance"];
     brokerCommissionBalance_ = dataUint256["brokerCommissionBalance"];
+    assetManagerCommissionBalance_ = dataUint256["assetManagerCommissionBalance"];
     naymsCommissionBalance_ = dataUint256["naymsCommissionBalance"];
   }
 

contracts/base/IPolicyImpl.sol

@@ -17,11 +17,14 @@ contract IPolicyImpl is IPolicyMutations {
     uint256 maturationDate_,
     address unit_,
     uint256 premiumIntervalSeconds_,
-    uint256 brokerCommissionRate_,
-    uint256 assetManagerCommissionRate_,
-    uint256 naymsCommissionRate_,
+    uint256 brokerCommissionBP_,
+    uint256 assetManagerCommissionBP_,
+    uint256 naymsCommissionBP_,
     uint256 numTranches_,
-    uint256 state_,
+    uint256 state_
+  );
+
+  function getClaimStats() public view returns (
     uint256 numClaims_,
     uint256 numPendingClaims_
   );
@@ -39,9 +42,9 @@ contract IPolicyImpl is IPolicyMutations {
   );
 
   function getCommissionBalances() public view returns (
+    uint256 brokerCommissionBalance_,
     uint256 assetManagerCommissionBalance_,
-    uint256 naymsCommissionBalance_,
-    uint256 brokerCommissionBalance_
+    uint256 naymsCommissionBalance_
   );
 
   function payTranchPremium (uint256 _index) public;

package.json

@@ -31,8 +31,8 @@
     "deploy:rinkeby": "yarn truffle networks --clean && yarn truffle migrate --network rinkeby && yarn extract-deployed-addresses",
     "deploy:local": "yarn truffle migrate --network test",
     "extract-deployed-addresses": "./scripts/extractDeployedAddresses.js",
-    "build-admin-dapp": "./scripts/generateAdminDapp.js && node_modules/.bin/solui publish-folder --spec ./dapp-generated.json --artifacts ./build/contracts --folder ./dapp",
-    "deploy-admin-dapp": "yarn build-admin-dapp && mkdir -p ./dapp/.circleci && cp ./.circleci/config.yml ./dapp/.circleci && gh-pages -t -d dapp -u \"Nayms Engineering <engineering@nayms.io>\"",
+    "build-admin-dapp": "./scripts/generateAdminDapp.js && node_modules/.bin/solui publish-folder --spec ./dapp-generated.json --artifacts ./build/contracts --folder ./dapp && mkdir -p ./dapp/.circleci && cp ./.circleci/config.yml ./dapp/.circleci && touch ./dapp/.nojekyll",
+    "deploy-admin-dapp": "yarn build-admin-dapp && gh-pages -t -d dapp -u \"Nayms Engineering <engineering@nayms.io>\"",
     "setup": "[[ -f .deployment.js ]] || cp .deployment-sample.js .deployment.js",
     "lint": "solhint --config ./.solhint.json contracts/**/*.sol",
     "abi-encode": "./scripts/abiEncode.js"

test/integration.js

@@ -361,8 +361,8 @@ contract('End-to-end integration tests', accounts => {
     // sanity check balances
     const policy1Tranch1ExpectedBalance = 100 + calcPremiumsMinusCommissions({
       premiums: [1000, 2000, 1000],
-      brokerCommissionBP: 1,
       assetManagerCommissionBP: 2,
+      brokerCommissionBP: 1,
       naymsCommissionBP: 3,
     })
     expect(policy1Tranch1ExpectedBalance).to.eq(4076)
@@ -371,8 +371,8 @@ contract('End-to-end integration tests', accounts => {
     })
     const expectedCommissions = calcCommissions({
       premiums: [1000, 2000, 1000],
-      brokerCommissionBP: 1,
       assetManagerCommissionBP: 2,
+      brokerCommissionBP: 1,
       naymsCommissionBP: 3,
     })
     expect(expectedCommissions.assetManagerCommission).to.eq(8)

test/policy.js

@@ -166,9 +166,7 @@ contract('Policy', accounts => {
         brokerCommissionBP_: 2,
         naymsCommissionBP_: 3,
         numTranches_: 0,
-        state_: POLICY_STATE_CREATED,
-        numClaims_: 0,
-        numPendingClaims_: 0,
+        state_: POLICY_STATE_CREATED
       })
     })
   })
@@ -525,8 +523,8 @@ contract('Policy', accounts => {
       describe('commissions', () => {
         beforeEach(async () => {
           await setupPolicy({
-            assetManagerCommissionBP: 1,
             brokerCommissionBP: 2,
+            assetManagerCommissionBP: 1,
             naymsCommissionBP: 3,
           })
 
@@ -930,7 +928,7 @@ contract('Policy', accounts => {
             await policy.makeClaim(1, entity.address, 1, { from: clientManagerAddress }).should.be.fulfilled
             await policy.makeClaim(1, entity.address, 5, { from: clientManagerAddress }).should.be.fulfilled
 
-            await policy.getInfo().should.eventually.matchObj({
+            await policy.getClaimStats().should.eventually.matchObj({
               numClaims_: 3,
               numPendingClaims_: 3,
             })
@@ -1001,7 +999,7 @@ contract('Policy', accounts => {
             it('updates internal stats', async () => {
               await policy.declineClaim(0, { from: assetManagerAddress }).should.be.fulfilled
 
-              await policy.getInfo().should.eventually.matchObj({
+              await policy.getClaimStats().should.eventually.matchObj({
                 numClaims_: 3,
                 numPendingClaims_: 2,
               })
@@ -1069,7 +1067,7 @@ contract('Policy', accounts => {
             it('updates internal stats', async () => {
               await policy.approveClaim(0, { from: assetManagerAddress }).should.be.fulfilled
 
-              await policy.getInfo().should.eventually.matchObj({
+              await policy.getClaimStats().should.eventually.matchObj({
                 numClaims_: 3,
                 numPendingClaims_: 2,
               })
@@ -1144,7 +1142,7 @@ contract('Policy', accounts => {
             it('and it updates the internal stats', async () => {
               await policy.payClaims()
 
-              await policy.getInfo().should.eventually.matchObj({
+              await policy.getClaimStats().should.eventually.matchObj({
                 numClaims_: 4,
                 numPendingClaims_: 1,
               })