From 6de24b1c5e031dd6bda5de7d5fb1161363443693 Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Thu, 21 Jun 2018 13:58:38 +0200 Subject: test: drop var-keyword in compilationTests in favor of explicit types --- test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol | 4 ++-- test/compilationTests/gnosis/Oracles/MajorityOracle.sol | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/compilationTests/gnosis') diff --git a/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol b/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol index 1529129d..344dd8d2 100644 --- a/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol +++ b/test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol @@ -95,7 +95,7 @@ contract LMSRMarketMaker is MarketMaker { // The price function is exp(quantities[i]/b) / sum(exp(q/b) for q in quantities) // To avoid overflow, calculate with // exp(quantities[i]/b - offset) / sum(exp(q/b - offset) for q in quantities) - var (sum, , outcomeExpTerm) = sumExpOffset(logN, netOutcomeTokensSold, funding, outcomeTokenIndex); + (uint256 sum, , uint256 outcomeExpTerm) = sumExpOffset(logN, netOutcomeTokensSold, funding, outcomeTokenIndex); return outcomeExpTerm / (sum / ONE); } @@ -116,7 +116,7 @@ contract LMSRMarketMaker is MarketMaker { // The cost function is C = b * log(sum(exp(q/b) for q in quantities)). // To avoid overflow, we need to calc with an exponent offset: // C = b * (offset + log(sum(exp(q/b - offset) for q in quantities))) - var (sum, offset, ) = sumExpOffset(logN, netOutcomeTokensSold, funding, 0); + (uint256 sum, int256 offset, ) = sumExpOffset(logN, netOutcomeTokensSold, funding, 0); costLevel = Math.ln(sum); costLevel = costLevel.add(offset); costLevel = (costLevel.mul(int(ONE)) / logN).mul(int(funding)); diff --git a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol b/test/compilationTests/gnosis/Oracles/MajorityOracle.sol index 1562ce48..4b02c2de 100644 --- a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol +++ b/test/compilationTests/gnosis/Oracles/MajorityOracle.sol @@ -72,7 +72,7 @@ contract MajorityOracle is Oracle { constant returns (bool) { - var (outcomeSet, ) = getStatusAndOutcome(); + (bool outcomeSet, ) = getStatusAndOutcome(); return outcomeSet; } @@ -83,7 +83,7 @@ contract MajorityOracle is Oracle { constant returns (int) { - var (, winningOutcome) = getStatusAndOutcome(); + (, int winningOutcome) = getStatusAndOutcome(); return winningOutcome; } } -- cgit