Use connectToLocalNodeWithVersion always

IntersectMBO · Jul 27, 2021 · 2e86092 · 2e86092
1 parent f60f233
commit 2e86092
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/cardano-api/src/Cardano/Api/IPC.hs b/cardano-api/src/Cardano/Api/IPC.hs
@@ -483,13 +483,14 @@ queryNodeLocalState :: forall mode result.
                     -> IO (Either Net.Query.AcquireFailure result)
 queryNodeLocalState connctInfo mpoint query = do
     resultVar <- newEmptyTMVarIO
-    connectToLocalNode
+    connectToLocalNodeWithVersion
       connctInfo
-      LocalNodeClientProtocols {
-        localChainSyncClient    = NoLocalChainSyncClient,
-        localStateQueryClient   = Just (singleQuery mpoint resultVar),
-        localTxSubmissionClient = Nothing
-      }
+      ( \_ntcVersion -> LocalNodeClientProtocols
+        { localChainSyncClient    = NoLocalChainSyncClient
+        , localStateQueryClient   = Just (singleQuery mpoint resultVar)
+        , localTxSubmissionClient = Nothing
+        }
+      )
     atomically (takeTMVar resultVar)
   where
     singleQuery
@@ -522,13 +523,14 @@ submitTxToNodeLocal :: forall mode.
                     -> IO (Net.Tx.SubmitResult (TxValidationErrorInMode mode))
 submitTxToNodeLocal connctInfo tx = do
     resultVar <- newEmptyTMVarIO
-    connectToLocalNode
+    connectToLocalNodeWithVersion
       connctInfo
-      LocalNodeClientProtocols {
-        localChainSyncClient    = NoLocalChainSyncClient,
-        localTxSubmissionClient = Just (localTxSubmissionClientSingle resultVar),
-        localStateQueryClient   = Nothing
-      }
+      ( \_ntcVersion -> LocalNodeClientProtocols
+        { localChainSyncClient    = NoLocalChainSyncClient
+        , localTxSubmissionClient = Just (localTxSubmissionClientSingle resultVar)
+        , localStateQueryClient   = Nothing
+        }
+      )
     atomically (takeTMVar resultVar)
   where
     localTxSubmissionClientSingle
@@ -550,13 +552,14 @@ submitTxToNodeLocal connctInfo tx = do
 getLocalChainTip :: LocalNodeConnectInfo mode -> IO ChainTip
 getLocalChainTip localNodeConInfo = do
     resultVar <- newEmptyTMVarIO
-    connectToLocalNode
+    connectToLocalNodeWithVersion
       localNodeConInfo
-      LocalNodeClientProtocols
+      ( \_ntcVersion -> LocalNodeClientProtocols
         { localChainSyncClient = LocalChainSyncClient $ chainSyncGetCurrentTip resultVar
         , localTxSubmissionClient = Nothing
         , localStateQueryClient = Nothing
         }
+      )
     atomically $ takeTMVar resultVar
 
 chainSyncGetCurrentTip

diff --git a/cardano-api/src/Cardano/Api/LedgerState.hs b/cardano-api/src/Cardano/Api/LedgerState.hs
@@ -63,7 +63,7 @@ import           Cardano.Api.Eras
 import           Cardano.Api.IPC (ConsensusModeParams (CardanoModeParams), EpochSlots (..),
                    LocalChainSyncClient (LocalChainSyncClientPipelined),
                    LocalNodeClientProtocols (..), LocalNodeClientProtocolsInMode,
-                   LocalNodeConnectInfo (..), connectToLocalNode)
+                   LocalNodeConnectInfo (..), connectToLocalNodeWithVersion)
 import           Cardano.Api.Modes (CardanoMode)
 import           Cardano.Api.NetworkId (NetworkId)
 import qualified Cardano.Chain.Genesis
@@ -242,9 +242,9 @@ foldBlocks nodeConfigFilePath socketPath networkId enableValidation state0 accum
   stateIORef <- lift $ newIORef state0
 
   -- Connect to the node.
-  lift $ connectToLocalNode
+  lift $ connectToLocalNodeWithVersion
     connectInfo
-    (protocols stateIORef errorIORef env ledgerState)
+    (\_ntcVersion -> protocols stateIORef errorIORef env ledgerState)
 
   lift (readIORef errorIORef) >>= \case
     Just err -> throwE (FoldBlocksApplyBlockError err)

diff --git a/cardano-client-demo/ScanBlocks.hs b/cardano-client-demo/ScanBlocks.hs
@@ -31,9 +31,9 @@ main = do
 
   -- Connect to the node.
   putStrLn $ "Connecting to socket: " <> socketPath
-  connectToLocalNode
+  connectToLocalNodeWithVersion
     (connectInfo socketPath)
-    protocols
+    (\_ntcVersion -> protocols)
   where
   connectInfo :: FilePath -> LocalNodeConnectInfo CardanoMode
   connectInfo socketPath =

diff --git a/cardano-client-demo/ScanBlocksPipelined.hs b/cardano-client-demo/ScanBlocksPipelined.hs
@@ -40,9 +40,9 @@ main = do
 
   -- Connect to the node.
   putStrLn $ "Connecting to socket: " <> socketPath
-  connectToLocalNode
+  connectToLocalNodeWithVersion
     (connectInfo socketPath)
-    protocols
+    (\_ntcVersion -> protocols)
   where
   connectInfo :: FilePath -> LocalNodeConnectInfo CardanoMode
   connectInfo socketPath =