CAD-1393 node: bump to latest 1.18+master

input-output-hk · Aug 3, 2020 · 28e957c · 28e957c
1 parent 11fc59b
commit 28e957c
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 47 deletions.
diff --git a/cabal.project b/cabal.project
@@ -16,29 +16,29 @@ packages:
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 42f17e5cb3050e489b7e7c879d1af809cedacf62
-  --sha256: 0ld17854dxjcy4q3ncp600jmpmbw86crcbwq2hyai5h5myrvy27v
+  tag: 9bc43bacd49309a06fc6820c3893a85324385d88
+  --sha256: 0bynhval4ww3hb591hx94gqdlbymxl2ci8r5f8m257vv8rd0r416
   subdir: cardano-api
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 42f17e5cb3050e489b7e7c879d1af809cedacf62
-  --sha256: 0ld17854dxjcy4q3ncp600jmpmbw86crcbwq2hyai5h5myrvy27v
+  tag: 9bc43bacd49309a06fc6820c3893a85324385d88
+  --sha256: 0bynhval4ww3hb591hx94gqdlbymxl2ci8r5f8m257vv8rd0r416
   subdir: cardano-cli
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 42f17e5cb3050e489b7e7c879d1af809cedacf62
-  --sha256: 0ld17854dxjcy4q3ncp600jmpmbw86crcbwq2hyai5h5myrvy27v
+  tag: 9bc43bacd49309a06fc6820c3893a85324385d88
+  --sha256: 0bynhval4ww3hb591hx94gqdlbymxl2ci8r5f8m257vv8rd0r416
   subdir: cardano-config
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 42f17e5cb3050e489b7e7c879d1af809cedacf62
-  --sha256: 0ld17854dxjcy4q3ncp600jmpmbw86crcbwq2hyai5h5myrvy27v
+  tag: 9bc43bacd49309a06fc6820c3893a85324385d88
+  --sha256: 0bynhval4ww3hb591hx94gqdlbymxl2ci8r5f8m257vv8rd0r416
   subdir: cardano-node
 
 -- source-repository-package

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx.hs
@@ -49,9 +49,10 @@ import           Network.Socket
                    ( AddrInfo (..), AddrInfoFlag (..), Family (..), SocketType (Stream)
                    , addrFamily,addrFlags, addrSocketType, defaultHints, getAddrInfo)
 
-import           Cardano.Config.Types
-                   ( NodeAddress (..), NodeHostAddress(..)
-                   , SigningKeyFile(..))
+import           Cardano.CLI.Types
+                   (SigningKeyFile(..))
+import           Cardano.Node.Types
+                   (NodeAddress (..), NodeHostAddress(..))
 
 import           Cardano.Api.Typed
 import           Cardano.Api.TxSubmit
@@ -93,7 +94,6 @@ secureFunds Benchmark{bTxFee, bInitialTTL} m (FundsGenesis keyF) = do
          genesisExpenditure m key toAddr genesisCoin bTxFee bInitialTTL
       txOfMode = castTxMode m tx
   r <- liftIO $ submitTx (modeLocalConnInfo m) txOfMode
-  liftIO . traceWith (trTxSubmit m) . TraceBenchTxSubDebug $ "------------- WIN3"
   case r of
     TxSubmitSuccess ->
       liftIO . traceWith (trTxSubmit m) . TraceBenchTxSubDebug

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Benchmark.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Benchmark.hs
@@ -64,13 +64,13 @@ import           Ouroboros.Consensus.Block.Abstract (SlotNo(..))
 import           Cardano.Api.Typed
 
 -- Node imports
-import           Cardano.Config.Types (NodeAddress)
-import           Cardano.TracingOrphanInstances.Byron()
-import           Cardano.TracingOrphanInstances.Common()
-import           Cardano.TracingOrphanInstances.Consensus()
-import           Cardano.TracingOrphanInstances.Mock()
-import           Cardano.TracingOrphanInstances.Network()
-import           Cardano.TracingOrphanInstances.Shelley()
+import           Cardano.Node.Types (NodeAddress)
+import           Cardano.Tracing.OrphanInstances.Byron()
+import           Cardano.Tracing.OrphanInstances.Common()
+import           Cardano.Tracing.OrphanInstances.Consensus()
+import           Cardano.Tracing.OrphanInstances.Mock()
+import           Cardano.Tracing.OrphanInstances.Network()
+import           Cardano.Tracing.OrphanInstances.Shelley()
 
 import Cardano.Benchmarking.GeneratorTx.CLI.Parsers
 

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/CLI/Parsers.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/CLI/Parsers.hs
@@ -23,9 +23,11 @@ import           Network.Socket (PortNumber)
 
 import           Cardano.Api.Typed
 import           Ouroboros.Consensus.Block.Abstract(SlotNo(..))
-import           Cardano.Config.Types
+import           Cardano.CLI.Types
                     ( SigningKeyFile(..)
-                    , SocketPath(..)
+                    )
+import           Cardano.Node.Types
+                    ( SocketPath(..)
                     , NodeAddress(..)
                     , NodeHostAddress(..)
                     )

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Era.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Era.hs
@@ -139,14 +139,14 @@ import           Cardano.Api.TxSubmit
 import qualified Cardano.Api.Typed as Api
 
 -- Node imports
-import           Cardano.Config.Types (SocketPath(..))
-import           Cardano.Node.Logging (LOContent(..), LoggingLayer (..))
-import           Cardano.TracingOrphanInstances.Byron()
-import           Cardano.TracingOrphanInstances.Common()
-import           Cardano.TracingOrphanInstances.Consensus()
-import           Cardano.TracingOrphanInstances.Mock()
-import           Cardano.TracingOrphanInstances.Network()
-import           Cardano.TracingOrphanInstances.Shelley()
+import           Cardano.Node.Configuration.Logging (LOContent(..), LoggingLayer (..))
+import           Cardano.Node.Types (SocketPath(..))
+import           Cardano.Tracing.OrphanInstances.Byron()
+import           Cardano.Tracing.OrphanInstances.Common()
+import           Cardano.Tracing.OrphanInstances.Consensus()
+import           Cardano.Tracing.OrphanInstances.Mock()
+import           Cardano.Tracing.OrphanInstances.Network()
+import           Cardano.Tracing.OrphanInstances.Shelley()
 
 import Cardano.Benchmarking.GeneratorTx.Benchmark
 

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs
@@ -33,7 +33,7 @@ import qualified Data.Map.Strict as Map
 import qualified Options.Applicative as Opt
 
 -- Era-agnostic imports
-import           Cardano.Config.Types
+import           Cardano.CLI.Types
                    (SigningKeyFile(..))
 import qualified Ouroboros.Consensus.Cardano as Consensus
 

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Submission.hs b/cardano-tx-generator/src/Cardano/Benchmarking/GeneratorTx/Submission.hs
@@ -53,12 +53,12 @@ import qualified Data.Time.Clock as Clock
 
 import           Control.Tracer (Tracer, traceWith)
 
-import           Cardano.TracingOrphanInstances.Byron()
-import           Cardano.TracingOrphanInstances.Common()
-import           Cardano.TracingOrphanInstances.Consensus()
-import           Cardano.TracingOrphanInstances.Mock()
-import           Cardano.TracingOrphanInstances.Network()
-import           Cardano.TracingOrphanInstances.Shelley()
+import           Cardano.Tracing.OrphanInstances.Byron()
+import           Cardano.Tracing.OrphanInstances.Common()
+import           Cardano.Tracing.OrphanInstances.Consensus()
+import           Cardano.Tracing.OrphanInstances.Mock()
+import           Cardano.Tracing.OrphanInstances.Network()
+import           Cardano.Tracing.OrphanInstances.Shelley()
 
 import           Ouroboros.Consensus.Ledger.SupportsMempool (txInBlockSize)
 import qualified Ouroboros.Consensus.Ledger.SupportsMempool as Mempool

diff --git a/cardano-tx-generator/src/Cardano/Benchmarking/Run.hs b/cardano-tx-generator/src/Cardano/Benchmarking/Run.hs
@@ -39,12 +39,11 @@ import           Ouroboros.Consensus.Cardano (Protocol, ProtocolByron, ProtocolS
 import qualified Cardano.Api.Protocol as Api
 import           Cardano.Api.Typed
 import           Cardano.Api.TxSubmit
-import           Cardano.Config.Types
-import           Cardano.Node.Logging
+import           Cardano.Node.Configuration.Logging
 import           Cardano.Node.Protocol.Cardano
 import           Cardano.Node.Protocol.Byron
 import           Cardano.Node.Protocol.Shelley
-import           Cardano.Node.Types hiding (Protocol)
+import           Cardano.Node.Types
 
 import           Cardano.Benchmarking.GeneratorTx
 import           Cardano.Benchmarking.GeneratorTx.Benchmark
@@ -67,7 +66,7 @@ data CliError =
 
 data GeneratorCmd =
   GenerateTxs FilePath
-              SocketPath
+              Cardano.Node.Types.SocketPath
               PartialBenchmark
               SomeEra
               GeneratorFunds

diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "42f17e5cb3050e489b7e7c879d1af809cedacf62",
-        "sha256": "0ld17854dxjcy4q3ncp600jmpmbw86crcbwq2hyai5h5myrvy27v",
+        "rev": "9bc43bacd49309a06fc6820c3893a85324385d88",
+        "sha256": "0bynhval4ww3hb591hx94gqdlbymxl2ci8r5f8m257vv8rd0r416",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/42f17e5cb3050e489b7e7c879d1af809cedacf62.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/9bc43bacd49309a06fc6820c3893a85324385d88.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-sl": {

diff --git a/stack.yaml b/stack.yaml
@@ -100,7 +100,7 @@ extra-deps:
       - test
 
   - git: https://github.com/input-output-hk/cardano-node
-    commit: 42f17e5cb3050e489b7e7c879d1af809cedacf62
+    commit: 9bc43bacd49309a06fc6820c3893a85324385d88
     subdirs:
       - cardano-api
       - cardano-config

diff --git a/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/CLI/Parsers.hs b/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/CLI/Parsers.hs
@@ -24,7 +24,7 @@ import           Options.Applicative as Opt
 import qualified Control.Arrow as Arr
 import           Network.Socket (PortNumber)
 
-import           Cardano.Config.Types
+import           Cardano.Node.Types
                     ( NodeAddress(..)
                     , NodeHostAddress(..)
                     )

diff --git a/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/CLI/Run.hs b/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/CLI/Run.hs
@@ -33,7 +33,7 @@ import           Cardano.Node.Types
                     ( ConfigYamlFilePath(..)
                     , NodeCLI(..)
                     )
-import           Cardano.Config.Types
+import           Cardano.Node.Types
                     ( DbFile(..), ConfigError(..)
                     , ProtocolFilepaths(..)
                     , SocketPath (..)

diff --git a/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/Utils.hs b/tx-generator-shelley/src/Cardano/Benchmarking/TxGenerator/Utils.hs
@@ -13,7 +13,7 @@ import           Network.Socket (AddrInfo (..),
 import           Cardano.BM.Data.Tracer (ToLogObject (..))
 import           Cardano.BM.Trace (appendName)
 import           Cardano.Node.Logging (LoggingLayer (..), Trace)
-import           Cardano.Config.Types (NodeAddress (..), NodeHostAddress(..))
+import           Cardano.Node.Types (NodeAddress (..), NodeHostAddress(..))
 
 import           Control.Tracer (Tracer)