Make constructor names of TokenBundleSizeAssessment consistent.

For some reason, the names of the constructors have diverged. This commit makes them consistent again.
cardano-foundation · Oct 22, 2021 · 39d6d24 · 39d6d24
1 parent 76e949f
commit 39d6d24
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Primitive/CoinSelection.hs b/lib/core/src/Cardano/Wallet/Primitive/CoinSelection.hs
@@ -860,7 +860,7 @@ verifySelectionOutputSizeExceedsLimitError cs _ps e
   where
     isWithinLimit = case (cs ^. #assessTokenBundleSize) bundle of
         TokenBundleSizeWithinLimit -> True
-        OutputTokenBundleSizeExceedsLimit -> False
+        TokenBundleSizeExceedsLimit -> False
       where
         bundle = outputReportedAsExceedingLimit ^. #tokens
 
@@ -1294,7 +1294,7 @@ verifyOutputSize cs out
     withinLimit =
         case (cs ^. #assessTokenBundleSize) (out ^. #tokens) of
             TokenBundleSizeWithinLimit -> True
-            OutputTokenBundleSizeExceedsLimit -> False
+            TokenBundleSizeExceedsLimit -> False
 
 -- | Indicates that a token quantity exceeds the maximum quantity that can
 --   appear in a transaction output's token bundle.

diff --git a/lib/core/src/Cardano/Wallet/Primitive/CoinSelection/Balance.hs b/lib/core/src/Cardano/Wallet/Primitive/CoinSelection/Balance.hs
@@ -1330,7 +1330,7 @@ tokenBundleSizeExceedsLimit (TokenBundleSizeAssessor assess) b =
     case assess b of
         TokenBundleSizeWithinLimit->
             False
-        OutputTokenBundleSizeExceedsLimit ->
+        TokenBundleSizeExceedsLimit ->
             True
 
 -- | Constructs change bundles for a set of selected inputs and outputs.

diff --git a/lib/core/src/Cardano/Wallet/Primitive/Types/Tx.hs b/lib/core/src/Cardano/Wallet/Primitive/Types/Tx.hs
@@ -782,8 +782,8 @@ data LocalTxSubmissionStatus tx = LocalTxSubmissionStatus
 --    * Enlarging a bundle that exceeds the limit should also result in a
 --      bundle that exceeds the limit:
 --      @
---              f  b1           == OutputTokenBundleSizeExceedsLimit
---          ==> f (b1 `add` b2) == OutputTokenBundleSizeExceedsLimit
+--              f  b1           == TokenBundleSizeExceedsLimit
+--          ==> f (b1 `add` b2) == TokenBundleSizeExceedsLimit
 --      @
 --
 --    * Shrinking a bundle that's within the limit should also result in a
@@ -805,7 +805,7 @@ data TokenBundleSizeAssessment
     = TokenBundleSizeWithinLimit
     -- ^ Indicates that the size of a token bundle does not exceed the maximum
     -- size that can be included in a transaction output.
-    | OutputTokenBundleSizeExceedsLimit
+    | TokenBundleSizeExceedsLimit
     -- ^ Indicates that the size of a token bundle exceeds the maximum size
     -- that can be included in a transaction output.
     deriving (Eq, Generic, Show)

diff --git a/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelection/BalanceSpec.hs b/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelection/BalanceSpec.hs
@@ -2218,7 +2218,7 @@ unMockAssessTokenBundleSize = \case
             case assetCount `compare` upperLimit of
                 LT -> TokenBundleSizeWithinLimit
                 EQ -> TokenBundleSizeWithinLimit
-                GT -> OutputTokenBundleSizeExceedsLimit
+                GT -> TokenBundleSizeExceedsLimit
 
 mkTokenBundleSizeAssessor
     :: MockAssessTokenBundleSize -> TokenBundleSizeAssessor

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
@@ -1922,7 +1922,7 @@ tokenBundleSizeAssessor maxSize = W.TokenBundleSizeAssessor {..}
         | serializedLengthBytes <= maxSize' =
             W.TokenBundleSizeWithinLimit
         | otherwise =
-            W.OutputTokenBundleSizeExceedsLimit
+            W.TokenBundleSizeExceedsLimit
       where
         serializedLengthBytes :: W.TxSize
         serializedLengthBytes = computeTokenBundleSerializedLengthBytes tb

diff --git a/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs b/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs
@@ -416,11 +416,11 @@ prop_assessTokenBundleSize_enlarge
     -> Blind (VariableSize16 TokenBundle)
     -> Property
 prop_assessTokenBundleSize_enlarge b1' b2' =
-    assess b1 == OutputTokenBundleSizeExceedsLimit ==> conjoin
+    assess b1 == TokenBundleSizeExceedsLimit ==> conjoin
         [ assess (b1 `TokenBundle.add` b2)
-            === OutputTokenBundleSizeExceedsLimit
+            === TokenBundleSizeExceedsLimit
         , assess (b1 `TokenBundle.setCoin` maxBound)
-            === OutputTokenBundleSizeExceedsLimit
+            === TokenBundleSizeExceedsLimit
         ]
   where
     assess = assessTokenBundleSize
@@ -516,15 +516,15 @@ unit_assessTokenBundleSize_fixedSizeBundle_64
     :: Blind (FixedSize64 TokenBundle) -> Property
 unit_assessTokenBundleSize_fixedSizeBundle_64 (Blind (FixedSize64 b)) =
     unit_assessTokenBundleSize_fixedSizeBundle b
-        OutputTokenBundleSizeExceedsLimit
+        TokenBundleSizeExceedsLimit
         maryTokenBundleMaxSize
         (TxSize 4228) (TxSize 4748)
 
 unit_assessTokenBundleSize_fixedSizeBundle_128
     :: Blind (FixedSize128 TokenBundle) -> Property
 unit_assessTokenBundleSize_fixedSizeBundle_128 (Blind (FixedSize128 b)) =
     unit_assessTokenBundleSize_fixedSizeBundle b
-        OutputTokenBundleSizeExceedsLimit
+        TokenBundleSizeExceedsLimit
         maryTokenBundleMaxSize
         (TxSize 8452) (TxSize 9484)