Address review comments

IntersectMBO · Oct 4, 2019 · df5d8fe · df5d8fe
1 parent 50c7c08
commit df5d8fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/shelley/chain-and-ledger/executable-spec/src/BaseTypes.hs b/shelley/chain-and-ledger/executable-spec/src/BaseTypes.hs
@@ -73,7 +73,7 @@ interval1 = UnitInterval 1
 -- | Evolving nonce type.
 data Nonce
   = Nonce (Hash SHA256 Nonce)
-  | NeutralNonce -- ^ 0 element
+  | NeutralNonce -- ^ Identity element
   deriving (Eq, Ord, Show)
 
 instance ToCBOR Nonce where
@@ -86,12 +86,6 @@ instance ToCBOR Nonce where
 x ⭒ NeutralNonce = x
 NeutralNonce ⭒ x = x
 
-instance Semigroup Nonce where
-  (<>) = (⭒)
-
-instance Monoid Nonce where
-  mempty = NeutralNonce
-
 -- | Make a nonce from a natural number
 mkNonce :: Natural -> Nonce
 mkNonce = Nonce . coerce . hash @SHA256

diff --git a/shelley/chain-and-ledger/executable-spec/src/BlockChain.hs b/shelley/chain-and-ledger/executable-spec/src/BlockChain.hs
@@ -230,8 +230,8 @@ mkSeed
   -> Nonce -- ^ Epoch nonce
   -> HashHeader hashAlgo dsignAlgo kesAlgo vrfAlgo
   -> Seed
-mkSeed (Nonce eta0) slot nonce lastHash =
-  Seed . coerce $ eta0 `Hash.xor` coerce (hash @SHA256 (slot, nonce, lastHash))
+mkSeed (Nonce uc) slot nonce lastHash =
+  Seed . coerce $ uc `Hash.xor` coerce (hash @SHA256 (slot, nonce, lastHash))
 mkSeed NeutralNonce slot nonce lastHash =
   Seed . coerce $ (hash @SHA256 (slot, nonce, lastHash))
 

diff --git a/shelley/chain-and-ledger/executable-spec/test/STSTests.hs b/shelley/chain-and-ledger/executable-spec/test/STSTests.hs
@@ -46,7 +46,7 @@ testUPNLate =
   let
     st = applySTS @UPDN (TRC (mkNonce 1, UpdnState (mkNonce 2) (mkNonce 3), Slot.Slot 85))
   in
-    st @?= Right (UpdnState ((mkNonce 2) <> (mkNonce 1)) (mkNonce 3))
+    st @?= Right (UpdnState ((mkNonce 2) ⭒ (mkNonce 1)) (mkNonce 3))
 
 testCHAINExample :: CHAINExample -> Assertion
 testCHAINExample (CHAINExample slotNow initSt block expectedSt) = do