PR fixes

Author: bezirg

plutus-benchmark/cardano-loans/src/CardanoLoans/Validator.hs

@@ -41,6 +41,7 @@ module CardanoLoans.Validator
   tokenAsPubKey,
   adaSymbol,
   adaToken,
+  fromHaskellRatio,
   unsafeRatio,
   (-),(*),(+),
   loanValidatorCode,

plutus-ledger-api/changelog.d/20251106_104633_bezirg_enum_ratio.md

@@ -1,7 +1,7 @@
-### Removed
-
-- From v3: fromGHC,toGHC
-
 ### Added
 
 - To v3: numerator,denominator,unsafeRatio
+
+### Changed
+
+- In v3: renamed fromGHC/toGHC to fromRatioHaskell/toRatioHaskell

plutus-ledger-api/src/PlutusLedgerApi/Data/V3.hs

@@ -232,6 +232,8 @@ module PlutusLedgerApi.Data.V3 (
   Ratio.unsafeRatio,
   Ratio.numerator,
   Ratio.denominator,
+  Ratio.fromHaskellRatio,
+  Ratio.toHaskellRatio,
 
   -- *** Association maps
   V2.Map,

plutus-ledger-api/src/PlutusLedgerApi/V3.hs

@@ -125,6 +125,8 @@ module PlutusLedgerApi.V3 (
   Ratio.unsafeRatio,
   Ratio.numerator,
   Ratio.denominator,
+  Ratio.fromHaskellRatio,
+  Ratio.toHaskellRatio,
 
   -- *** Association maps
   V2.Map,

plutus-tx-plugin/test/StdLib/Spec.hs

@@ -17,7 +17,7 @@ import Control.Exception (SomeException, evaluate, try)
 import Control.Monad.Except (runExceptT)
 import Control.Monad.IO.Class (MonadIO (liftIO))
 import Data.Proxy (Proxy (..))
-import Data.Ratio (Ratio,(%), numerator, denominator)
+import Data.Ratio ((%))
 import GHC.Exts (fromString)
 import Hedgehog (MonadGen, Property)
 import Hedgehog qualified
@@ -50,7 +50,7 @@ tests =
       [ embed testRatioInterop
       , testRatioProperty "round" Ratio.round round
       , testRatioProperty "truncate" Ratio.truncate truncate
-      , testRatioProperty "abs" (fmap (\ r -> Ratio.numerator r % Ratio.denominator r) Ratio.abs) abs
+      , testRatioProperty "abs" (fmap Ratio.toHaskellRatio Ratio.abs) abs
       , embed $ testPropertyNamed "ord" "testOrd" testOrd
       , embed $ testPropertyNamed "divMod" "testDivMod" testDivMod
       , embed $ testPropertyNamed "quotRem" "testQuotRem" testQuotRem
@@ -69,12 +69,9 @@ tryHard :: (MonadIO m, NFData a) => a -> m (Maybe a)
 -- the body, i.e. outside of the call to 'try', defeating the whole purpose.
 tryHard ~a = reoption <$> (liftIO $ try @SomeException $ evaluate $ force a)
 
-fromGHC :: Ratio Integer -> Ratio.Rational
-fromGHC r = Ratio.unsafeRatio (numerator r) (denominator r)
-
 testRatioInterop :: TestTree
 testRatioInterop = testCase "ratioInterop" do
-  runExceptT (runUPlc [getPlcNoAnn roundPlc, snd (Lift.liftProgramDef (fromGHC 3.75))])
+  runExceptT (runUPlc [getPlcNoAnn roundPlc, snd (Lift.liftProgramDef (Ratio.fromHaskellRatio 3.75))])
     >>= \case
       Left e -> assertFailure (show e)
       Right r -> r @?= Core.mkConstant () (4 :: Integer)
@@ -85,7 +82,7 @@ testRatioProperty nm plutusFunc ghcFunc =
   embed $ testPropertyNamed nm (fromString nm) $ Hedgehog.property $ do
     rat <- Hedgehog.forAll $ Gen.realFrac_ (Range.linearFrac (-10000) 100000)
     let ghcResult = ghcFunc rat
-        plutusResult = plutusFunc $ fromGHC rat
+        plutusResult = plutusFunc $ Ratio.fromHaskellRatio rat
     Hedgehog.annotateShow ghcResult
     Hedgehog.annotateShow plutusResult
     Hedgehog.assert (ghcResult == plutusResult)
@@ -120,7 +117,7 @@ testOrd = Hedgehog.property $ do
   n1 <- Hedgehog.forAll $ (%) <$> gen <*> gen'
   n2 <- Hedgehog.forAll $ (%) <$> gen <*> gen'
   ghcResult <- tryHard $ n1 <= n2
-  plutusResult <- tryHard $ (PlutusTx.<=) (fromGHC n1) (fromGHC n2)
+  plutusResult <- tryHard $ (PlutusTx.<=) (Ratio.fromHaskellRatio n1) (Ratio.fromHaskellRatio n2)
   Hedgehog.annotateShow ghcResult
   Hedgehog.annotateShow plutusResult
   Hedgehog.assert (ghcResult == plutusResult)

plutus-tx/changelog.d/20251106_085646_bezirg_enum_ratio.md

@@ -1,7 +1,11 @@
 ### Removed
 
-- PlutusTx.Ratio: half, toGHC, fromGHC
+- PlutusTx.Ratio: half
 
 ### Added
 
-- Enum Ratio instance that mimicks GHC instance
+- Enum Ratio instance that mimicks Haskell's instance
+
+### Changed
+
+- Renamed Ratio's fromGHC/toGHC to fromRatioHaskell/toRatioHaskell

plutus-tx/src/PlutusTx/Ratio.hs

@@ -32,6 +32,10 @@ module PlutusTx.Ratio (
   abs,
   negate,
   gcd,
+
+  -- * Conversion from/to Haskell
+  fromHaskellRatio,
+  toHaskellRatio,
 ) where
 
 import PlutusTx.Applicative qualified as P
@@ -48,6 +52,7 @@ import PlutusTx.Ord qualified as P
 import PlutusTx.Trace qualified as P
 import PlutusTx.Enum
 
+import Data.Ratio qualified as HS
 import PlutusTx.Builtins qualified as Builtins
 
 import Control.Monad (guard)
@@ -69,6 +74,8 @@ The following two invariants are maintained:
 data Rational = Rational Integer Integer
   deriving stock (Haskell.Eq, Show, Generic)
 
+makeLift ''Rational
+
 instance Pretty Rational where
   pretty (Rational a b) = "Rational:" <+> pretty a <+> pretty b
 
@@ -392,7 +399,19 @@ instance Enum Rational where
         then []
         else x1 : dn_list (x1 P.+ delta)
 
-$(makeLift ''Rational)
+{-| Converts a GHC 'Ratio.Rational', preserving value.
+
+Note: Does not work on-chain.
+-}
+fromHaskellRatio :: HS.Rational -> Rational
+fromHaskellRatio r = unsafeRatio (HS.numerator r) (HS.denominator r)
+
+{-| Converts a 'Rational' to a GHC 'Ratio.Rational', preserving value.
+
+Note: Does not work on-chain.
+-}
+toHaskellRatio :: Rational -> HS.Rational
+toHaskellRatio (Rational n d) = n HS.% d
 
 {- HLINT ignore -}