SCP-3220 adjusted path in .nix file and revised comment

input-output-hk · Jan 13, 2022 · 39b9a9a · 39b9a9a
1 parent f757831
commit 39b9a9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bitte/pab.nix b/bitte/pab.nix
@@ -48,7 +48,7 @@ let
       mscKeptBlocks = 100000;
       mscInitialTxWallets = [ ];
       mscNodeMode = "AlonzoNode";
-      mscProtocolParametersJsonPath = "../marlowe-dashboard-client/private-testnet.protocol";
+      mscProtocolParametersJsonPath = ../marlowe-dashboard-client/private-testnet.protocol;
     };
 
     chainIndexConfig = {

diff --git a/marlowe/src/Language/Marlowe/Scripts.hs b/marlowe/src/Language/Marlowe/Scripts.hs
@@ -198,10 +198,9 @@ smallMarloweValidator MarloweParams{rolesCurrency, rolePayoutValidatorHash, slot
     let scriptInValue = txOutValue $ txInInfoResolved ownInput
     let interval =
             case TimeSlot.posixTimeRangeToContainedSlotRange TimeSlot.SlotConfig{..} $ txInfoValidRange scriptContextTxInfo of
-                -- FIXME restore this when mockchain implementation updates to correct one
---              Interval.Interval (Interval.LowerBound (Interval.Finite l) True) (Interval.UpperBound (Interval.Finite h) False) -> (l, h)
-                -- FIXME remove this when mockchain implementation updates to correct one as above
-                Interval.Interval (Interval.LowerBound (Interval.Finite l) _   ) (Interval.UpperBound (Interval.Finite h) _    ) -> (l, h)
+                -- FIXME: Recheck this, but it appears that any inclusiveness can appear at either bound when milliseconds
+                --        of POSIX time is converted from slot number.
+                Interval.Interval (Interval.LowerBound (Interval.Finite l) _) (Interval.UpperBound (Interval.Finite h) _) -> (l, h)
                 _ -> traceError "R0"
     let positiveBalances = traceIfFalse "B0" $ validateBalances marloweState