Merge #1219

1219: Buildkite: fix weeder r=rvl a=rvl



Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>

.buildkite/rebuild.hs

@@ -70,8 +70,8 @@ main = do
             buildResult <- buildStep optDryRun bk
             when (shouldUploadCoverage bk) $ uploadCoverageStep optDryRun
             whenRun optDryRun $ cachePutStep cacheConfig
-            void $ weederStep optDryRun
-            exitWith buildResult
+            weederResult <- weederStep optDryRun
+            exitWith (buildResult -&&- weederResult)
         CleanupCache ->
             cleanupCacheStep optDryRun cacheConfig optBuildDirectory
         PurgeCache ->
@@ -599,3 +599,10 @@ timeout mins act = race (sleep (fromIntegral mins * 60)) act >>= \case
     Left () -> do
         eprintf ("\nTimed out after "%d%" minutes.\n") mins
         pure (ExitFailure 124)
+
+-- | Combine two 'ExitCode' results with "and".
+(-&&-) :: ExitCode -> ExitCode -> ExitCode
+ExitSuccess -&&- st = st
+exitFailure -&&- _ = exitFailure
+
+infixr 3 -&&-

.weeder.yaml

@@ -4,20 +4,125 @@
     - name: test:unit
     - message:
       - name: Weeds exported
+      - module:
+        - name: Cardano.Pool.MetricsSpec
+        - identifier:
+          - RegistrationsTest
+          - arbitraryChunks
       - module:
         - name: Cardano.Wallet.DB.StateMachine
         - identifier: showLabelledExamples
+      - module:
+        - name: Spec
+        - identifier: main
   - section:
     - name: test:unit bench:db
     - message:
       - name: Module reused between components
+      - module: Cardano.Wallet.DummyTarget.Primitive.Types
+    - message:
+      - name: Weeds exported
+      - module:
+        - name: Cardano.Wallet.DummyTarget.Primitive.Types
+        - identifier: genesisHash
+- package:
+  - name: cardano-wallet-jormungandr
+  - section:
+    - name: test:integration
+    - message:
+      - name: Redundant build-depends entry
+      - depends:
+        - aeson-qq
+        - cryptonite
+        - exceptions
+        - extra
+        - generic-arbitrary
+        - lifted-base
+        - monad-control
+        - persistent
+        - safe
+        - template-haskell
+        - time
+        - warp
+        - yaml
+  - section:
+    - name: test:integration bench:latency
+    - message:
+      - name: Module reused between components
+      - module:
+        - Cardano.Faucet
+        - Cardano.Wallet.Jormungandr.Launch
+        - Test.Integration.Jcli
+    - message:
+      - name: Weeds exported
+      - module:
+        - name: Cardano.Faucet
+        - identifier: genFaucets
+      - module:
+        - name: Cardano.Wallet.Jormungandr.Launch
+        - identifier: withBackendOnly
+  - section:
+    - name: test:unit
+    - message:
+      - name: Weeds exported
+      - module:
+        - name: Cardano.Wallet.Jormungandr.NetworkSpec
+        - identifier:
+          - C
+          - Consumer
+          - MockBlock
+          - 'N'
+          - Node
+          - NodeAddBlocks
+          - NodeGarbageCollect
+          - NodeOp
+          - NodeRewind
+          - S
+          - TestNetworkLayer
+          - addGaps
+          - applyNodeOp
+          - applyNodeOps
+          - block0
+          - block0H
+          - consumerRestoreStep
+          - emptyNode
+          - fromJBlock
+          - genBlocks
+          - genBlocksWith
+          - genCheckpoints
+          - genConsumer
+          - genGC
+          - genGaps
+          - genNodeOp
+          - genNodeOps
+          - genRewind
+          - genSwitchChain
+          - genesisHash
+          - getNodeChain
+          - getNodeTip
+          - isNodeAddBlocks
+          - isNodeRewindOf
+          - mockBlockHash
+          - mockJormungandrClient
+          - mockNetworkLayer
+          - nodeAddBlocks
+          - nodeGarbageCollect
+          - nodeRewind
+          - parentGenesisHash
+          - prop_generator
+          - prop_sync
+          - removeNoOp
+          - shiftOp
+          - showBlock
+          - showChain
+          - showCheckpoints
+          - showHash
+          - toJBlock
 - package:
   - name: cardano-wallet-launcher
   - section:
     - name: library
     - message:
       - name: Module not compiled
       - module: Cardano.Launcher.Windows
-- package:
-  - name: cardano-wallet-jormungandr
-  - section: test:integration
+

lib/cli/cardano-wallet-cli.cabal

@@ -44,7 +44,6 @@ library
     , iohk-monitoring
     , servant-client
     , servant-client-core
-    , servant-server
     , text
     , text-class
     , optparse-applicative
@@ -68,12 +67,10 @@ test-suite unit
       -Werror
   build-depends:
       base
-    , cardano-crypto
     , cardano-wallet-cli
     , cardano-wallet-core
     , filepath
     , hspec
-    , memory
     , optparse-applicative
     , QuickCheck
     , temporary

lib/core-integration/cardano-wallet-core-integration.cabal

@@ -42,7 +42,6 @@ library
     , directory
     , exceptions
     , extra
-    , filepath
     , generic-lens
     , hspec
     , hspec-expectations-lifted
@@ -53,7 +52,6 @@ library
     , retry
     , time
     , template-haskell
-    , temporary
     , text
     , text-class
     , time

lib/core/cardano-wallet-core.cabal

@@ -80,7 +80,6 @@ library
     , split
     , streaming-commons
     , template-haskell
-    , temporary
     , text
     , text-class
     , time
@@ -205,7 +204,6 @@ test-suite unit
     , servant-swagger
     , stm
     , swagger2
-    , template-haskell
     , temporary
     , text
     , text-class
@@ -291,7 +289,6 @@ benchmark db
     , cardano-crypto
     , cardano-wallet-core
     , cardano-wallet-launcher
-    , cborg
     , containers
     , criterion
     , cryptonite
@@ -303,10 +300,7 @@ benchmark db
     , memory
     , persistent-sqlite
     , random
-    , split
     , temporary
-    , text
-    , text-class
     , time
     , transformers
   type:

lib/jormungandr/cardano-wallet-jormungandr.cabal

@@ -35,7 +35,6 @@ library
       base
     , aeson
     , async
-    , base58-bytestring
     , binary
     , bytestring
     , cardano-crypto
@@ -46,10 +45,8 @@ library
     , contra-tracer
     , cryptonite
     , deepseq
-    , directory
     , either
     , exceptions
-    , extra
     , filepath
     , fmt
     , http-client
@@ -60,7 +57,6 @@ library
     , monad-loops
     , memory
     , network
-    , safe
     , servant
     , servant-client
     , servant-client-core
@@ -69,7 +65,6 @@ library
     , text-class
     , time
     , transformers
-    , yaml
     , warp
   hs-source-dirs:
       src
@@ -108,7 +103,6 @@ executable cardano-wallet-jormungandr
     , optparse-applicative
     , process
     , text
-    , text-class
   hs-source-dirs:
       exe
   main-is:
@@ -135,7 +129,6 @@ test-suite unit
     , bytestring
     , cardano-crypto
     , cardano-wallet-core
-    , cardano-wallet-core-integration
     , cardano-wallet-jormungandr
     , cardano-wallet-test-utils
     , containers
@@ -144,7 +137,6 @@ test-suite unit
     , filepath
     , fmt
     , generic-arbitrary
-    , generic-lens
     , hspec
     , hspec-golden-aeson
     , lifted-base
@@ -156,7 +148,6 @@ test-suite unit
     , servant
     , text
     , text-class
-    , time
     , transformers
   build-tools:
       hspec-discover
@@ -234,7 +225,6 @@ test-suite integration
     , text-class
     , time
     , transformers
-    , unliftio
     , warp
     , yaml
   build-tools: