fix lint issues

Author: hellwolf

packages/spec-haskell/pkgs/core/src/Money/Systems/Superfluid/MonetaryUnitData/DecayingFlow.hs

@@ -38,7 +38,7 @@ instance MonetaryUnitLenses amuLs sft => Semigroup (MonetaryUnitData amuLs sft)
     --           { t_s = t_s', αVal = α', εVal = ε' } = b
     MkMonetaryUnitData a <> MkMonetaryUnitData b =
         let c = a & set  settledAt     (b^.settledAt)
-                  & over αVal          (\α -> α * exp (-λ * t_Δ) - ε')
+                  & over αVal          (\α -> α * exp (-(λ * t_Δ)) - ε')
                   & over εVal          (+ ε')
         in MkMonetaryUnitData c
         where ε'  = b^.εVal
@@ -52,7 +52,7 @@ instance MonetaryUnitLenses amuLs sft => MonetaryUnitDataClass (MonetaryUnitData
     --   rtb(aad, t) = α * e ^ (-λ * (t - t_s)) + ε
     --       where { t_s = t_s, αVal = α, εVal = ε } = aad
     balanceProvided (MkMonetaryUnitData a) t =
-        let b = ceiling $ α * exp (-λ * t_Δ) + ε
+        let b = ceiling $ α * exp ((-λ) * t_Δ) + ε
         in  typedValuesToRTB [ (mkAnyTypedValue . MkUntappedValue) b ]
         where t_s   = a^.settledAt
               α     = a^.αVal

packages/spec-haskell/pkgs/core/src/Money/Theory/PaymentPrimitives.lhs

@@ -90,10 +90,10 @@ sem :: MoneyDistribution md
     => 𝓜 md -> MoneyDistributionModel' md
 sem (TransferI ka kb amount) = \u _ ->
     let x = fromIntegral amount
-    in ceiling $ -x * ρ ka u + x * ρ kb u
+    in ceiling $ -(x * ρ ka u) + x * ρ kb u
 sem (FlowI ka kb r t') = \u t ->
-    let x = fromIntegral $ -r * coerce(t - t')
-    in ceiling $ -x * ρ ka u + x * ρ kb u
+    let x = fromIntegral $ -(r * coerce(t - t'))
+    in ceiling $ -(x * ρ ka u) + x * ρ kb u
 -- GHC 9.4.2 bug re non-exhaustive pattern matching?
 sem _ = error "huh?"
 

packages/spec-haskell/pkgs/simple/test/Money/Systems/Superfluid/ConstantFlowAgreement_test.hs

@@ -73,8 +73,8 @@ simple1to1ScenarioTest = TokenTestCase TokenTestSpec
     runToken $ SF.updateFlow alice bob (2*fr1x)
     expectFlowRateTo  (alice,   bob) $ assertEqual' (2*fr1x)
     expectFlowRateTo  (alice, carol) $ assertEqual'       0
-    expectNetFlowRateTo alice $ assertEqual' (- 2*fr1x)
-    expectNetFlowRateTo bob   $ assertEqual' (  2*fr1x)
+    expectNetFlowRateTo alice $ assertEqual' ((-2) * fr1x)
+    expectNetFlowRateTo bob   $ assertEqual' (2 * fr1x)
     expectNetFlowRateTo carol $ assertEqual'      0
     expectZeroTotalValue
 
@@ -117,7 +117,7 @@ simple1to2ScenarioTest = TokenTestCase TokenTestSpec
     expectFlowRateTo (alice, bob)   $ assertEqual'    fr1x
     expectFlowRateTo (alice, carol) $ assertEqual' (3*fr1x)
     expectFlowRateTo (bob, carol)   $ assertEqual'       0
-    expectNetFlowRateTo alice $ assertEqual'  (-4*fr1x)
+    expectNetFlowRateTo alice $ assertEqual'  ((-4)*fr1x)
     expectNetFlowRateTo bob   $ assertEqual'      fr1x
     expectNetFlowRateTo carol $ assertEqual'  ( 3*fr1x)
     expectZeroTotalValue
@@ -131,12 +131,12 @@ simple1to2ScenarioTest = TokenTestCase TokenTestSpec
 
     -- T3a: updating flow: alice -> bob 2x
     runToken $ SF.updateFlow alice bob (2*fr1x)
-    expectFlowRateTo (alice, bob)   $ assertEqual' (2*fr1x)
-    expectFlowRateTo (alice, carol) $ assertEqual' (3*fr1x)
+    expectFlowRateTo (alice, bob)   $ assertEqual' (2 * fr1x)
+    expectFlowRateTo (alice, carol) $ assertEqual' (3 * fr1x)
     expectFlowRateTo (bob, carol)   $ assertEqual'       0
-    expectNetFlowRateTo alice $ assertEqual'  (-5*fr1x)
-    expectNetFlowRateTo bob   $ assertEqual'  ( 2*fr1x)
-    expectNetFlowRateTo carol $ assertEqual'  ( 3*fr1x)
+    expectNetFlowRateTo alice $ assertEqual'  ((-5) * fr1x)
+    expectNetFlowRateTo bob   $ assertEqual'  (2 * fr1x)
+    expectNetFlowRateTo carol $ assertEqual'  (3 * fr1x)
     expectZeroTotalValue
 
     -- T4: move time forward and test balance moves

packages/spec-haskell/pkgs/simple/test/Money/Systems/Superfluid/DecayingFlowAgreement_test.hs

@@ -85,11 +85,11 @@ simple1to2ScenarioTest = TokenTestCase TokenTestSpec
     let [alice, bob, carol] = testAddresses ctx
     runToken $ SF.updateDecayingFlow alice bob        u1x
     runToken $ SF.updateDecayingFlow alice carol (u1x * 2)
-    expectΕValTo alice $ assertFuzzilyEqualWith (-3*u1xd)
+    expectΕValTo alice $ assertFuzzilyEqualWith ((-3) * u1xd)
     expectΕValTo bob   $ assertFuzzilyEqualWith     u1xd
-    expectΕValTo carol $ assertFuzzilyEqualWith  (2*u1xd)
+    expectΕValTo carol $ assertFuzzilyEqualWith  (2 * u1xd)
     expectDistributionLimitTo (alice, bob)   $ assertEqual'    u1x
-    expectDistributionLimitTo (alice, carol) $ assertEqual' (2*u1x)
+    expectDistributionLimitTo (alice, carol) $ assertEqual' ( 2 * u1x)
 
     -- T1: move time forward and test balance moves
     timeTravel $ 3600 * 24