Update SubmitTx to only require a socket path and tx file

IntersectMBO · Dec 6, 2019 · 0bf1d3d · 0bf1d3d
1 parent 67a3f3a
commit 0bf1d3d
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 44 deletions.
diff --git a/cardano-config/src/Cardano/Config/CommonCLI.hs b/cardano-config/src/Cardano/Config/CommonCLI.hs
@@ -155,11 +155,11 @@ parseSocketDirLast =
                 \  ${dir}/node-{core,relay}-${node-id}.socket"
     )
 
-parseSocketPath :: Parser SocketPath
-parseSocketPath =
+parseSocketPath :: Text -> Parser SocketPath
+parseSocketPath helpMessage =
   SocketFile <$> strOption
     ( long "socket-path"
-        <> help "Path to a cardano-node socket"
+        <> (help $ toS helpMessage)
         <> completer (bashCompleter "file")
         <> metavar "FILEPATH"
     )

diff --git a/cardano-node/app/cardano-cli.hs b/cardano-node/app/cardano-cli.hs
@@ -309,8 +309,7 @@ parseTxRelatedValues =
         "Submit a raw, signed transaction, in its on-wire representation."
         $ SubmitTx
             <$> parseTxFile "tx"
-            <*> parseTopologyInfo "Target node that will receive the transaction"
-            <*> parseNodeId "Node Id of target node"
+            <*> parseSocketPath "Socket path of the target node."
     , command'
         "issue-genesis-utxo-expenditure"
         "Write a file with a signed transaction, spending genesis UTxO."

diff --git a/cardano-node/app/chairman.hs b/cardano-node/app/chairman.hs
@@ -135,7 +135,7 @@ parseChairmanArgs =
           "timeout-is-success" "Exit successfully on timeout."
       <*> (GenesisFile <$> parseGenesisPath)
       <*> parseGenesisHash
-      <*> parseSocketPath
+      <*> parseSocketPath "Path to a cardano-node socket"
       <*> (ConfigYamlFilePath <$> parseConfigFile)
       <*> (optional $ SigningKeyFile <$> parseSigningKey)
       <*> (optional $ DelegationCertFile <$> parseDelegationCert)

diff --git a/cardano-node/src/Cardano/CLI/Run.hs b/cardano-node/src/Cardano/CLI/Run.hs
@@ -73,7 +73,7 @@ import           Cardano.Config.Types (CardanoConfiguration(..), Core(..),
                                        DelegationCertFile(..), GenesisFile(..),
                                        SigningKeyFile(..), SocketPath(..))
 import           Cardano.Config.Logging (LoggingLayer (..))
-import           Cardano.Config.Topology (NodeAddress(..), TopologyInfo(..))
+import           Cardano.Config.Topology (NodeAddress(..))
 
 -- | Sub-commands of 'cardano-cli'.
 data ClientCommand
@@ -124,8 +124,8 @@ data ClientCommand
   | SubmitTx
     TxFile
     -- ^ Filepath of transaction to submit.
-    TopologyInfo
-    NodeId
+    SocketPath
+    -- ^ Socket path of target node.
   | SpendGenesisUTxO
     NewTxFile
     -- ^ Filepath of the newly created transaction.
@@ -215,21 +215,19 @@ runCommand _ _(CheckDelegation magic cert issuerVF delegateVF) = do
   liftIO $ checkByronGenesisDelegation cert magic issuerVK delegateVK
 
 runCommand
-  (CardanoConfiguration{ccCore, ccProtocol, ccSocketDir, ccUpdate})
+  (CardanoConfiguration{ccCore, ccProtocol, ccUpdate})
   _
-  (SubmitTx fp topology nid) = do
+  (SubmitTx fp targetSp) = do
     tx <- liftIO $ readByronTx fp
     liftIO $ nodeSubmitTx
-               topology
                (coGenesisHash ccCore)
-               (nid)
                (coNumCoreNodes ccCore)
                (GenesisFile $ coGenesisFile ccCore)
                (coRequiresNetworkMagic ccCore)
                (coPBftSigThd ccCore)
                (DelegationCertFile <$> (coStaticKeyDlgCertFile ccCore))
                (SigningKeyFile <$> (coStaticKeySigningKeyFile ccCore))
-               (SocketFile ccSocketDir)
+               targetSp
                ccUpdate
                ccProtocol
                tx

diff --git a/cardano-node/src/Cardano/CLI/Tx.hs b/cardano-node/src/Cardano/CLI/Tx.hs
@@ -53,7 +53,6 @@ import           Cardano.CLI.Tx.Submission
 import           Cardano.Config.Protocol
 import           Cardano.Config.Types (DelegationCertFile, GenesisFile,
                                        SigningKeyFile, SocketPath, Update)
-import           Cardano.Config.Topology
 import           Cardano.Common.Orphans ()
 
 
@@ -289,11 +288,10 @@ issueUTxOExpenditure
 
 -- | Submit a transaction to a node specified by topology info.
 nodeSubmitTx
-  :: TopologyInfo
-  -> Text
-  -> NodeId
+  :: Text
+  -- ^ Genesis hash.
   -> Maybe Int
-  -- ^ Number of core nodes
+  -- ^ Number of core nodes.
   -> GenesisFile
   -> RequiresNetworkMagic
   -> Maybe Double
@@ -305,22 +303,20 @@ nodeSubmitTx
   -> GenTx ByronBlock
   -> IO ()
 nodeSubmitTx
-  topology
   gHash
-  nId
   mNumCoreNodes
   genFile
   nMagic
   sigThresh
   delCertFp
   sKeyFp
-  socketFp
+  targetSocketFp
   update
   ptcl
   gentx =
-    withRealPBFT gHash (Just nId) mNumCoreNodes genFile nMagic sigThresh delCertFp sKeyFp update ptcl $
+    withRealPBFT gHash Nothing mNumCoreNodes genFile nMagic sigThresh delCertFp sKeyFp update ptcl $
       \p@Consensus.ProtocolRealPBFT{} -> do
         case gentx of
           ByronTx txid _ -> putStrLn $ sformat ("TxId: "%Crypto.hashHexF) txid
           _ -> pure ()
-        handleTxSubmission socketFp p topology gentx stdoutTracer
+        handleTxSubmission targetSocketFp p gentx stdoutTracer
diff --git a/cardano-node/src/Cardano/CLI/Tx/Generation.hs b/cardano-node/src/Cardano/CLI/Tx/Generation.hs
@@ -89,7 +89,6 @@ import           Ouroboros.Consensus.Ledger.Byron (ByronBlock (..),
                                                    GenTx (..),
                                                    ByronConsensusProtocol)
 import qualified Ouroboros.Consensus.Ledger.Byron as Byron
-import           Ouroboros.Consensus.NodeId (NodeId (..))
 import           Ouroboros.Consensus.Protocol.Abstract (NodeConfig)
 import           Ouroboros.Consensus.Protocol.PBFT (pbftExtConfig)
 
@@ -420,7 +419,7 @@ prepareInitialFunds llTracer
                                               genesisAddress
                                               (NE.fromList [outForBig])
 
-  submitTx socketFp pInfoConfig (CoreId 0) genesisTx llTracer
+  submitTx socketFp pInfoConfig genesisTx llTracer
   -- Done, the first transaction 'initGenTx' is submitted, now 'sourceAddress' has a lot of money.
 
   let txIn  = CC.UTxO.TxInUtxo (getTxIdFromGenTx genesisTx) 0
@@ -813,7 +812,7 @@ createMoreFundCoins llTracer
                                              txOut
                                              []
   liftIO $ forM_ splittingTxs $ \(tx, txDetailsList) -> do
-    submitTx socketFp pInfoConfig (CoreId 0) tx llTracer
+    submitTx socketFp pInfoConfig tx llTracer
     -- Update available fundValueStatus to reuse the numSplittingTxOuts TxOuts.
     forM_ txDetailsList addToAvailableFunds
  where

diff --git a/cardano-node/src/Cardano/CLI/Tx/Submission.hs b/cardano-node/src/Cardano/CLI/Tx/Submission.hs
@@ -28,7 +28,6 @@ import           Ouroboros.Consensus.Node.ProtocolInfo ( ProtocolInfo(..)
                                                        , protocolInfo)
 import           Ouroboros.Consensus.Node.Run (RunNode)
 import qualified Ouroboros.Consensus.Node.Run as Node
-import           Ouroboros.Consensus.NodeId (NodeId(..))
 import qualified Ouroboros.Consensus.Protocol as Consensus
 import           Ouroboros.Consensus.Protocol hiding (Protocol)
 
@@ -48,7 +47,6 @@ import           Ouroboros.Network.Protocol.Handshake.Version ( Versions
 import           Ouroboros.Network.NodeToClient (NetworkConnectTracers (..))
 import qualified Ouroboros.Network.NodeToClient as NodeToClient
 
-import           Cardano.Config.Topology
 import           Cardano.Common.LocalSocket
 import           Cardano.Config.Types (SocketPath(..))
 
@@ -67,35 +65,33 @@ handleTxSubmission :: forall blk.
                       )
                    => SocketPath
                    -> Consensus.Protocol blk
-                   -> TopologyInfo
                    -> GenTx blk
                    -> Tracer IO String
                    -> IO ()
-handleTxSubmission socketFp ptcl tinfo tx tracer = do
+handleTxSubmission targetSocketFp ptcl tx tracer = do
     let pinfo :: ProtocolInfo blk
         pinfo = protocolInfo ptcl
 
-    submitTx socketFp (pInfoConfig pinfo) (node tinfo) tx tracer
+    submitTx targetSocketFp (pInfoConfig pinfo) tx tracer
 
 submitTx :: ( RunNode blk
             , Show (ApplyTxErr blk)
             )
          => SocketPath
          -> NodeConfig (BlockProtocol blk)
-         -> NodeId
          -> GenTx blk
          -> Tracer IO String
          -> IO ()
-submitTx socketFp protoInfoConfig _ tx tracer = do
-    socketPath <- localSocketAddrInfo socketFp
+submitTx targetSocketFp protoInfoConfig tx tracer = do
+    targetSocketFp' <- localSocketAddrInfo targetSocketFp
     NodeToClient.connectTo
       NetworkConnectTracers {
           nctMuxTracer       = nullTracer,
           nctHandshakeTracer = nullTracer
         }
       (localInitiatorNetworkApplication tracer protoInfoConfig tx)
       Nothing
-      socketPath
+      targetSocketFp'
 
 localInitiatorNetworkApplication
   :: forall blk m peer.

diff --git a/cardano-node/src/Cardano/Common/Parsers.hs b/cardano-node/src/Cardano/Common/Parsers.hs
@@ -93,7 +93,7 @@ nodeMockParser = do
   -- Filepaths
   topFp <- parseTopologyFile
   dbFp <- parseDbPath
-  socketFp <- parseSocketPath
+  socketFp <- parseSocketPath "Path to a cardano-node socket"
 
   genHash <- parseGenesisHash
 
@@ -131,7 +131,7 @@ nodeRealParser = do
   genFp <- optional parseGenesisPath
   delCertFp <- optional parseDelegationCert
   sKeyFp <- optional parseSigningKey
-  socketFp <- parseSocketPath
+  socketFp <- parseSocketPath "Path to a cardano-node socket"
 
   genHash <- parseGenesisHash
 

diff --git a/cardano-node/src/Cardano/Wallet/Client.hs b/cardano-node/src/Cardano/Wallet/Client.hs
@@ -30,7 +30,6 @@ import           Ouroboros.Consensus.Block (BlockProtocol)
 import           Ouroboros.Consensus.Mempool
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Node.Run
-import           Ouroboros.Consensus.NodeId
 import           Ouroboros.Consensus.Protocol
 
 import           Network.TypedProtocol.Codec
@@ -58,10 +57,9 @@ runWalletClient :: forall blk.
                    )
                 => Protocol blk
                 -> SocketPath
-                -> CoreNodeId
                 -> Tracer IO String
                 -> IO ()
-runWalletClient ptcl sockFp (CoreNodeId _) tracer = do
+runWalletClient ptcl sockFp tracer = do
 
     addr <- localSocketAddrInfo sockFp
 

diff --git a/cardano-node/src/Cardano/Wallet/Run.hs b/cardano-node/src/Cardano/Wallet/Run.hs
@@ -42,7 +42,7 @@ runClient WalletCLI{ waNodeCli , waGenesisHash} tracer = do
                         (ncUpdate nc)
                         (ncProtocol nc)
     let socketDir = socketFile $ realMscFp waNodeCli
-    runWalletClient p socketDir coreNodeId tracer'
+    runWalletClient p socketDir tracer'
 
 data WalletCLI = WalletCLI { waNodeCli :: !NodeCLI
                            , waGenesisHash :: !Text

diff --git a/scripts/submit-tx.sh b/scripts/submit-tx.sh
@@ -21,8 +21,6 @@ NETARGS=(
         --genesis-file "${genesis_file}"
         --genesis-hash "${genesis_hash}"
         submit-tx
-        --topology      "configuration/simple-topology.json"
-        --node-id      "0"
         --tx           "$TX"
 )