Merge pull request #5084 from input-output-hk/newhoggy/delete-duplica…

…te-packages-sort-packages-and-imports Delete duplicate packages sort packages and imports
IntersectMBO · Apr 12, 2023 · a148a00 · a148a00
2 parents 8d78d96 + 6e05177
commit a148a00
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -65,6 +65,7 @@ library
                         Cardano.Api.Eras
                         Cardano.Api.Error
                         Cardano.Api.Fees
+                        Cardano.Api.Genesis
                         Cardano.Api.GenesisParameters
                         Cardano.Api.Hash
                         Cardano.Api.HasTypeProxy
@@ -84,8 +85,8 @@ library
                         Cardano.Api.Modes
                         Cardano.Api.NetworkId
                         Cardano.Api.OperationalCertificate
-                        Cardano.Api.ProtocolParameters
                         Cardano.Api.Protocol
+                        Cardano.Api.ProtocolParameters
                         Cardano.Api.Query
                         Cardano.Api.Script
                         Cardano.Api.ScriptData
@@ -96,7 +97,6 @@ library
                         Cardano.Api.SerialiseRaw
                         Cardano.Api.SerialiseTextEnvelope
                         Cardano.Api.SerialiseUsing
-                        Cardano.Api.Genesis
                         Cardano.Api.SpecialByron
                         Cardano.Api.StakePoolMetadata
                         Cardano.Api.Tx
@@ -109,8 +109,8 @@ library
 
   build-depends:        aeson             >= 1.5.6.0
                       , aeson-pretty      >= 0.8.5
-                      , attoparsec
                       , array
+                      , attoparsec
                       , base16-bytestring >= 1.0
                       , base58-bytestring
                       , bech32 >= 1.1.0
@@ -122,15 +122,17 @@ library
                       , cardano-data ^>= 0.1
                       , cardano-ledger-alonzo ^>= 0.1
                       , cardano-ledger-babbage ^>= 0.1
-                      , cardano-ledger-conway
                       , cardano-ledger-byron ^>= 0.1
+                      , cardano-ledger-conway
                       , cardano-ledger-core ^>= 0.1
+                      , cardano-ledger-shelley ^>= 0.1
                       , cardano-ledger-shelley-ma ^>= 0.1
                       , cardano-protocol-tpraos >= 0.1
                       , cardano-slotting >= 0.1
+                      , cardano-strict-containers ^>= 0.1
                       , cborg
-                      , contra-tracer
                       , containers
+                      , contra-tracer
                       , cryptonite
                       , deepseq
                       , directory
@@ -162,10 +164,7 @@ library
                       , scientific
                       , serialise
                       , small-steps ^>= 0.1
-                      , cardano-ledger-shelley ^>= 0.1
-                      , small-steps ^>= 0.1
                       , stm
-                      , cardano-strict-containers ^>= 0.1
                       , text
                       , time
                       , transformers
@@ -217,13 +216,15 @@ test-suite cardano-api-test
                       , bytestring
                       , cardano-api
                       , cardano-api:gen
-                      , cardano-data ^>= 0.1
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.0
                       , cardano-crypto-test ^>= 1.4
                       , cardano-crypto-tests ^>= 2.0
+                      , cardano-data ^>= 0.1
                       , cardano-ledger-alonzo ^>= 0.1
                       , cardano-ledger-core ^>= 0.1
+                      , cardano-ledger-shelley ^>= 0.1
+                      , cardano-ledger-shelley-test ^>= 0.1
                       , cardano-slotting ^>= 0.1
                       , containers
                       , hedgehog
@@ -232,8 +233,6 @@ test-suite cardano-api-test
                       , ouroboros-consensus
                       , ouroboros-consensus-shelley
                       , QuickCheck
-                      , cardano-ledger-shelley ^>= 0.1
-                      , cardano-ledger-shelley-test ^>= 0.1
                       , tasty
                       , tasty-hedgehog
                       , tasty-quickcheck

diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -138,26 +138,21 @@ library
                       , base16-bytestring
                       , bytestring
                       , cardano-api
-                      , cardano-data >= 0.1
-                      , cardano-git-rev
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
-                      , cardano-ledger-core
-                      , cardano-ledger-byron
-                      , cardano-ledger-conway
-                      , cardano-ledger-shelley
-                      , cardano-ledger-shelley-ma
+                      , cardano-data >= 0.1
+                      , cardano-git-rev
                       , cardano-ledger-alonzo
                       , cardano-ledger-babbage
                       , cardano-ledger-byron
+                      , cardano-ledger-conway
                       , cardano-ledger-core
                       , cardano-ledger-shelley
                       , cardano-ledger-shelley-ma
                       , cardano-prelude
                       , cardano-protocol-tpraos >= 0.1
                       , cardano-slotting >= 0.1
                       , cborg >= 0.2.4
-                      , contra-tracer
                       , containers
                       , contra-tracer
                       , deepseq
@@ -168,7 +163,6 @@ library
                       , filepath
                       , generic-data
                       , hostname
-                      , iproute
                       , io-classes >= 0.3
                       , iohk-monitoring
                       , iproute
@@ -196,14 +190,14 @@ library
                       , psqueues
                       , safe-exceptions
                       , scientific
-                      , strict-stm
                       , stm
+                      , strict-stm
                       , text
                       , time
-                      , tracer-transformers
                       , trace-dispatcher
                       , trace-forward
                       , trace-resources
+                      , tracer-transformers
                       , transformers
                       , transformers-except
                       , typed-protocols >= 0.1