Make tests more robust

test/trinity/SortedVesselsTest.js

@@ -77,7 +77,7 @@ contract("SortedVessels", async accounts => {
 			await network.provider.send("evm_revert", [initialSnapshotId])
 		})
 
-		it("contains(): returns true for addresses that have opened vessels", async () => {
+		it.only("contains(): returns true for addresses that have opened vessels", async () => {
 			await openVessel({
 				asset: erc20.address,
 				ICR: toBN(dec(150, 16)),

test/trinity/StabilityPoolTest.js

@@ -6,9 +6,10 @@ const mv = testHelpers.MoneyValues
 const timeValues = testHelpers.TimeValues
 
 var contracts
-var validCollateral
 var snapshotId
 var initialSnapshotId
+var validCollateral
+var unsortedCollaterals
 
 const openVessel = async params => th.openVessel(contracts.core, params)
 const deploy = async (treasury, distributor, mintingAccounts) => {
@@ -33,7 +34,7 @@ const deploy = async (treasury, distributor, mintingAccounts) => {
 	longTimelock = contracts.core.longTimelock
 
 	validCollateral = await adminContract.getValidCollateral()
-
+	unsortedCollaterals = validCollateral.slice(0)
 	// getDepositorGains() expects a sorted collateral array
 	validCollateral = validCollateral.slice(0).sort((a, b) => toBN(a.toLowerCase()).sub(toBN(b.toLowerCase())))
 
@@ -1132,8 +1133,9 @@ contract("StabilityPool", async accounts => {
 				// Expect alice to be entitled to 1000/200000 of the liquidated coll
 
 				const aliceExpectedGainERC20 = liquidatedCollERC20.mul(toBN(dec(1000, 18))).div(toBN(dec(200_000, 18)))
-				const idx = validCollateral.indexOf(erc20.address)
-				const aliceGainERC20 = (await stabilityPool.getDepositorGains(alice, validCollateral))[1][idx]
+
+				const aliceDepositorGains = await stabilityPool.getDepositorGains(alice, validCollateral)
+				const aliceGainERC20 = aliceDepositorGains[1][aliceDepositorGains[0].indexOf(erc20.address)]
 				assert.isTrue(aliceExpectedGainERC20.eq(aliceGainERC20))
 
 				// Alice withdraws from SP, chooses not to receive gains to avoid transfer/swap costs
@@ -1150,7 +1152,8 @@ contract("StabilityPool", async accounts => {
 				await stabilityPool.withdrawFromSP(dec(199_000, 18), validCollateral, { from: whale })
 				const stability_col_AfterWhaleERC20 = await stabilityPool.getCollateral(erc20.address)
 
-				const lastAssetError_Offset= (await stabilityPool.lastAssetError_Offset(idx)).div(toBN(10).pow(toBN(18)))
+				const collateralId = unsortedCollaterals.indexOf(erc20.address)
+				const lastAssetError_Offset= (await stabilityPool.lastAssetError_Offset(collateralId)).div(toBN(10).pow(toBN(18)))
 				assert.closeTo(stability_col_AfterWhaleERC20.sub(aliceExpectedGainERC20), lastAssetError_Offset, toBN(Math.floor(lastAssetError_Offset * 0.001)))
 			})
 

test/trinity/VesselManagerTest.js

@@ -19,6 +19,7 @@ var contracts
 var snapshotId
 var initialSnapshotId
 var validCollateral
+var unsortedCollaterals
 
 const deploy = async (treasury, distributor, mintingAccounts) => {
 	contracts = await deploymentHelper.deployTestContracts(treasury, distributor, mintingAccounts)
@@ -42,7 +43,7 @@ const deploy = async (treasury, distributor, mintingAccounts) => {
 	longTimelock = contracts.core.longTimelock
 
 	validCollateral = await adminContract.getValidCollateral()
-
+	unsortedCollaterals = validCollateral.slice(0)
 	// getDepositorGains() expects a sorted collateral array
 	validCollateral = validCollateral.slice(0).sort((a, b) => toBN(a.toLowerCase()).sub(toBN(b.toLowerCase())))
 
@@ -1169,8 +1170,10 @@ contract("VesselManager", async accounts => {
 				// Check Bob' SP deposit has absorbed Carol's debt, and he has received her liquidated ETH
 
 				const bob_Deposit_Before_Asset = await stabilityPool.getCompoundedDebtTokenDeposits(bob)
-				const idx = validCollateral.indexOf(erc20.address)
-				const bob_ETHGain_Before_Asset = (await stabilityPool.getDepositorGains(bob, validCollateral))[1][idx]
+
+
+				const bob_depositor_gains = (await stabilityPool.getDepositorGains(bob, validCollateral))
+				const bob_ETHGain_Before_Asset = bob_depositor_gains[1][bob_depositor_gains[0].indexOf(erc20.address)]
 
 				assert.isAtMost(th.getDifference(bob_Deposit_Before_Asset, B_spDeposit.sub(C_debt_Asset)), 1000000)
 				assert.isAtMost(th.getDifference(bob_ETHGain_Before_Asset, C_collateral_Asset), 1000)
@@ -1199,13 +1202,13 @@ contract("VesselManager", async accounts => {
 
      Check Bob' SP deposit has been reduced to 50 TRI, and his ETH gain has increased to 1.5 ETH. */
 				const alice_Deposit_After_Asset = (await stabilityPool.getCompoundedDebtTokenDeposits(alice)).toString()
-				const alice_ETHGain_After_Asset = (await stabilityPool.getDepositorGains(alice, validCollateral))[1][
-					idx
-				].toString()
+				const alice_depositor_gains = (await stabilityPool.getDepositorGains(alice, validCollateral))			
+				const alice_ETHGain_After_Asset = alice_depositor_gains[1][alice_depositor_gains[0].indexOf(erc20.address)].toString()
 
 				const totalDeposits_Asset = bob_Deposit_Before_Asset.add(A_spDeposit)
 
-				const lastAssetError_Offset= (await stabilityPool.lastAssetError_Offset(idx)).div(toBN(10).pow(toBN(18)))
+				const collateral_Id = unsortedCollaterals.indexOf(erc20.address)
+				const lastAssetError_Offset= (await stabilityPool.lastAssetError_Offset(collateral_Id)).div(toBN(10).pow(toBN(18)))
 				const lastDebtTokenLossError_Offset = (await stabilityPool.lastDebtTokenLossError_Offset()).div(toBN(10).pow(toBN(18)))
 
 				assert.isAtMost(
@@ -1224,7 +1227,10 @@ contract("VesselManager", async accounts => {
 				)
 
 				const bob_Deposit_After_Asset = await stabilityPool.getCompoundedDebtTokenDeposits(bob)
-				const bob_ETHGain_After_Asset = (await stabilityPool.getDepositorGains(bob, validCollateral))[1][idx]
+
+				const bob_depositor_gains_After_Asset = (await stabilityPool.getDepositorGains(bob, validCollateral))
+				const bob_ETHGain_After_Asset = bob_depositor_gains_After_Asset[1][bob_depositor_gains_After_Asset[0].indexOf(erc20.address)]
+
 
 				assert.isAtMost(
 					th.getDifference(