tx-generator: remove support for legacy JSON format

IntersectMBO · Jan 13, 2022 · 5d373cc · 5d373cc
1 parent 19457d2
commit 5d373cc
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 290 deletions.
diff --git a/bench/script/test-full-auto.ljson b/bench/script/test-full-auto.ljson
diff --git a/bench/script/test-plutus-to-file.ljson b/bench/script/test-plutus-to-file.ljson
diff --git a/bench/script/test-plutus.ljson b/bench/script/test-plutus.ljson
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Command.hs b/bench/tx-generator/src/Cardano/Benchmarking/Command.hs
@@ -17,11 +17,10 @@ import           Options.Applicative as Opt
 
 import           Ouroboros.Network.NodeToClient (withIOManager)
 
-import           Cardano.Benchmarking.Script (runScript, parseScriptFileAeson, parseScriptFileLegacy)
+import           Cardano.Benchmarking.Script (runScript, parseScriptFileAeson)
 
 data Command
   = Json !FilePath
-  | LegacyJson !FilePath  
 
 runCommand :: IO ()
 runCommand = withIOManager $ \iocp -> do
@@ -32,9 +31,6 @@ runCommand = withIOManager $ \iocp -> do
     Json file     -> do
       script <- parseScriptFileAeson file
       runScript script iocp >>= handleError
-    LegacyJson file     -> do
-      script <- parseScriptFileLegacy file
-      runScript script iocp >>= handleError
   where
   handleError :: Show a => Either a b -> IO ()
   handleError = \case
@@ -43,10 +39,7 @@ runCommand = withIOManager $ \iocp -> do
 
 commandParser :: Parser Command
 commandParser
-  = subparser
-    ( jsonCmd
-      <> legacyJsonCmd
-    )
+  = subparser jsonCmd
  where
   jsonCmd = command "json"
     (Json <$> info (strArgument (metavar "FILEPATH"))
@@ -55,11 +48,3 @@ commandParser
       <> header "tx-generator - run a generic benchmarking script"
       )
     )
-
-  legacyJsonCmd = command "legacy-json"
-    (LegacyJson <$> info (strArgument (metavar "FILEPATH"))
-      (  progDesc "tx-generator run JsonScript (legacy format)"
-      <> fullDesc
-      <> header "tx-generator - run a generic benchmarking script (legacy JSON format)"
-      )
-    )
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Script.hs b/bench/tx-generator/src/Cardano/Benchmarking/Script.hs
@@ -4,7 +4,6 @@ module Cardano.Benchmarking.Script
   ( Script
   , runScript
   , parseScriptFileAeson
-  , parseScriptFileLegacy  
   )
 where
 
@@ -20,7 +19,6 @@ import           Cardano.Node.Configuration.Logging (shutdownLoggingLayer)
 import           Cardano.Benchmarking.Tracer (createDebugTracers)
 import           Cardano.Benchmarking.Script.Action
 import           Cardano.Benchmarking.Script.Aeson (parseScriptFileAeson)
-import           Cardano.Benchmarking.Script.AesonLegacy (parseScriptFileLegacy)
 import           Cardano.Benchmarking.Script.Core (initGlobalWallet, setProtocolParameters)
 import           Cardano.Benchmarking.Script.Env
 import           Cardano.Benchmarking.Script.Store

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Script/AesonLegacy.hs b/bench/tx-generator/src/Cardano/Benchmarking/Script/AesonLegacy.hs
diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -40,7 +40,6 @@ library
                        Cardano.Benchmarking.Script
                        Cardano.Benchmarking.Script.Action
                        Cardano.Benchmarking.Script.Aeson
-                       Cardano.Benchmarking.Script.AesonLegacy                       
                        Cardano.Benchmarking.Script.Core
                        Cardano.Benchmarking.Script.Env
                        Cardano.Benchmarking.Script.Example