Refactor the tests to accomodate for TestMFlowRate

Author: divyaranjan1905

packages/spec-haskell/pkgs/semantic-money/test/Money/Theory/SemanticMoney_prop.hs

@@ -16,13 +16,13 @@ import           Money.Theory.TestMonetaryTypes
 -- Monetary Units Laws: settle-idempotency, constant-rtb
 --------------------------------------------------------------------------------
 
-mu_settle_idempotency :: ( MonetaryUnit TestMonetaryTypes TestTime TestMValue mu
+mu_settle_idempotency :: ( MonetaryUnit TestMonetaryTypes TestTime TestMValue TestMFlowRate mu
                       , Eq mu
                       ) => mu -> TestTime -> Bool
 mu_settle_idempotency a t =
     settledAt (settle t a) == t &&
     settle t a == settle t (settle t a)
-mu_constant_rtb :: ( MonetaryUnit TestMonetaryTypes TestTime TestMValue mu
+mu_constant_rtb :: ( MonetaryUnit TestMonetaryTypes TestTime TestMValue TestMFlowRate mu
                    ) => mu -> TestTime -> TestTime -> TestTime -> Bool
 mu_constant_rtb a t1 t2 t3 =
     rtb (settle t1 a) t3 == rtb a t3 &&
@@ -134,28 +134,28 @@ one2n_pd_tests = describe "1toN proportional distribution 2-primitives" $ do
 
 uu_flow2 (a :: TestUniversalIndex) (b :: TestUniversalIndex) t1 r1 t2 r2 t3 =
     flowRate b' == r2 && flowRate a' == -r2 &&
-    r1 `mt_v_mul_t` (t2 - t1) + r2 `mt_v_mul_t` (t3 - t2) == rtb b' t3 - rtb b t1
+    r1 `mt_fr_mul_t` (t2 - t1) + r2 `mt_fr_mul_t` (t3 - t2) == rtb b' t3 - rtb b t1
     where (a', b') = flow2 r2 t2 (flow2 r1 t1 (a, b))
 
 updp_flow2 (a :: TestUniversalIndex) t1 r1 t2 r2 t3 =
     flowRate b'' == r2 && flowRate a'' == -r2 &&
     flowRate (b'', b1') == r2 &&
-    r1 `mt_v_mul_t` (t2 - t1) + r2 `mt_v_mul_t` (t3 - t2) == rtb (b'', b1') t3 - rtb (b', b1') t1
+    r1 `mt_fr_mul_t` (t2 - t1) + r2 `mt_fr_mul_t` (t3 - t2) == rtb (b'', b1') t3 - rtb (b', b1') t1
     where (a', (b', b1')) = pdpUpdateMember2 1 t1 (a, (mempty :: TestPDPoolIndex, def))
           (a'', b'') = flow2 r2 t2 (flow2 r1 t1 (a', b'))
 
 uu_shiftFlow2a (a :: TestUniversalIndex) (b :: TestUniversalIndex) t1 r1 t2 r2 t3 =
     flowRate b' - flowRate b == r1 + r2 && flowRate a' - flowRate a == -r1 -r2 &&
     rtb b' t3 - rtb b t3 == rtb a t3 - rtb a' t3 &&
     -- for shift flow semantics: rtb b' t3 - (rtb b t3 - rtb b t1) - rtb b t1 == rtb b' t3 - rtb b t3
-    r1 `mt_v_mul_t` (t2 - t1) + (r1 + r2) `mt_v_mul_t` (t3 - t2) == rtb b' t3 - rtb b t3
+    r1 `mt_fr_mul_t` (t2 - t1) + (r1 + r2) `mt_fr_mul_t` (t3 - t2) == rtb b' t3 - rtb b t3
     where (a', b') = shiftFlow2a r2 t2 (shiftFlow2a r1 t1 (a, b))
 
 uu_shiftFlow2b (a :: TestUniversalIndex) (b :: TestUniversalIndex) t1 r1 t2 r2 t3 =
     flowRate b' - flowRate b == r1 + r2 && flowRate a' - flowRate a == -r1 -r2 &&
     rtb b' t3 - rtb b t3 == rtb a t3 - rtb a' t3 &&
     -- ditto
-    r1 `mt_v_mul_t` (t2 - t1) + (r1 + r2) `mt_v_mul_t` (t3 - t2) == rtb b' t3 - rtb b t3
+    r1 `mt_fr_mul_t` (t2 - t1) + (r1 + r2) `mt_fr_mul_t` (t3 - t2) == rtb b' t3 - rtb b t3
     where (a', b') = shiftFlow2b r2 t2 (shiftFlow2b r1 t1 (a, b))
 
 -- NOTE: updp_shiftFlow2a is an invalid property due to right side biansed error term adjustment.
@@ -165,7 +165,7 @@ updp_shiftFlow2b (a :: TestUniversalIndex) t1 r1 t2 r2 t3 =
     flowRate (b'', b1') == r1 + r2 &&
     rtb (b'', b1') t3 - rtb (b', b1') t3 == rtb a' t3 - rtb a'' t3 &&
     -- ditto
-    r1 `mt_v_mul_t` (t2 - t1) + (r1 + r2) `mt_v_mul_t` (t3 - t2) == rtb (b'', b1') t3 - rtb (b', b1') t3
+    r1 `mt_fr_mul_t` (t2 - t1) + (r1 + r2) `mt_fr_mul_t` (t3 - t2) == rtb (b'', b1') t3 - rtb (b', b1') t3
     where (a', (b', b1')) = pdpUpdateMember2 1 t1 (a, (mempty :: TestPDPoolIndex, def))
           (a'', b'') = shiftFlow2b r2 t2 (shiftFlow2b r1 t1 (a', b'))