Merge pull request #2469 from input-output-hk/jonathanknowles/multi-a…

…sset-coin-selection-integration Multi-asset coin selection integration: test suite additions
cardano-foundation · Jan 27, 2021 · af28496 · af28496
2 parents f44e56c + 5e3d602
commit af28496
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Primitive/CoinSelection/MA/RoundRobin.hs b/lib/core/src/Cardano/Wallet/Primitive/CoinSelection/MA/RoundRobin.hs
@@ -365,6 +365,7 @@ prepareOutputsWith minCoinValueFor = fmap $ \out ->
 --
 --    inputsSelected ∪ utxoRemaining == utxoAvailable
 --    inputsSelected ∩ utxoRemaining == ∅
+--    outputsCovered == outputsToCover
 --
 performSelection
     :: forall m. (HasCallStack, MonadRandom m)

diff --git a/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelection/MA/RoundRobinSpec.hs b/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelection/MA/RoundRobinSpec.hs
@@ -400,6 +400,13 @@ prop_prepareOutputsWith_preparedOrExistedBefore minCoinValueDef outs =
 -- Performing a selection
 --------------------------------------------------------------------------------
 
+-- | The result of calling 'performSelection'.
+--
+-- We define this type alias to shorten type signatures.
+--
+type PerformSelectionResult =
+    Either SelectionError (SelectionResult TokenBundle)
+
 genSelectionCriteria :: Gen UTxOIndex -> Gen SelectionCriteria
 genSelectionCriteria genUTxOIndex = do
     utxoAvailable <- genUTxOIndex
@@ -455,12 +462,12 @@ prop_performSelection_small minCoinValueFor costFor (Blind (Small criteria)) =
     selectionUnlimited :: Bool
     selectionUnlimited = not selectionLimited
 
-    selectionSufficient :: Either SelectionError SelectionResult -> Bool
+    selectionSufficient :: PerformSelectionResult -> Bool
     selectionSufficient = \case
         Right _ -> True
         _ -> False
 
-    selectionInsufficient :: Either SelectionError SelectionResult -> Bool
+    selectionInsufficient :: PerformSelectionResult -> Bool
     selectionInsufficient = \case
         Left (SelectionInsufficient _) -> True
         _ -> False
@@ -482,7 +489,7 @@ prop_performSelection
     :: MinCoinValueFor
     -> CostFor
     -> Blind SelectionCriteria
-    -> (Either SelectionError SelectionResult -> Property -> Property)
+    -> (PerformSelectionResult -> Property -> Property)
     -> Property
 prop_performSelection minCoinValueFor costFor (Blind criteria) coverage =
     monadicIO $ do
@@ -526,6 +533,7 @@ prop_performSelection minCoinValueFor costFor (Blind criteria) coverage =
             == UTxOIndex.insertMany inputsSelected utxoRemaining
         assert $ utxoRemaining
             == UTxOIndex.deleteMany (fst <$> inputsSelected) utxoAvailable
+        assert $ view #outputsCovered result == NE.toList outputsToCover
         case selectionLimit of
             MaximumInputLimit limit ->
                 assert $ NE.length inputsSelected <= limit
@@ -538,8 +546,8 @@ prop_performSelection minCoinValueFor costFor (Blind criteria) coverage =
             { inputsSkeleton =
                 UTxOIndex.fromSequence inputsSelected
             , outputsSkeleton =
-                outputsToCover
-            , changeSkeleton  =
+                NE.toList outputsToCover
+            , changeSkeleton  = NE.toList $
                 fmap (TokenMap.getAssets . view #tokens) changeGenerated
             }
         balanceSelected =
@@ -885,8 +893,8 @@ linearCost SelectionSkeleton{inputsSkeleton, outputsSkeleton, changeSkeleton}
     = Coin
     $ fromIntegral
     $ UTxOIndex.size inputsSkeleton
-    + NE.length outputsSkeleton
-    + NE.length changeSkeleton
+    + F.length outputsSkeleton
+    + F.length changeSkeleton
 
 data MakeChangeData = MakeChangeData
     { inputBundles