Merge #2170

2170: New testnet fork point config r=newhoggy a=newhoggy Co-authored-by: John Ky <[email protected]>
IntersectMBO · Dec 7, 2020 · a6dc965 · a6dc965
2 parents 196ba71 + a07891e
commit a6dc965
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/cardano-node-chairman/src/Testnet/ByronShelley.hs b/cardano-node-chairman/src/Testnet/ByronShelley.hs
@@ -10,7 +10,8 @@
 #endif
 
 module Testnet.ByronShelley
-  ( TestnetOptions(..)
+  ( ForkPoint(..)
+  , TestnetOptions(..)
   , defaultTestnetOptions
 
   , testnet
@@ -37,6 +38,7 @@ import           GHC.Real
 import           Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket (..))
 import           Hedgehog.Extras.Stock.Time
 import           System.FilePath.Posix ((</>))
+import           Text.Read
 import           Text.Show
 
 import qualified Data.Aeson as J
@@ -70,11 +72,17 @@ import qualified Testnet.Conf as H
 {- HLINT ignore "Redundant <&>" -}
 {- HLINT ignore "Redundant flip" -}
 
+data ForkPoint
+  = AtVersion Int
+  | AtEpoch Int
+  deriving (Show, Eq, Read)
+
 data TestnetOptions = TestnetOptions
   { numBftNodes :: Int
   , numPoolNodes :: Int
   , activeSlotsCoeff :: Double
   , epochLength :: Int
+  , forkPoint :: ForkPoint
   } deriving (Eq, Show)
 
 defaultTestnetOptions :: TestnetOptions
@@ -83,6 +91,7 @@ defaultTestnetOptions = TestnetOptions
   , numPoolNodes = 1
   , activeSlotsCoeff = 0.1
   , epochLength = 1500
+  , forkPoint = AtVersion 1
   }
 
 ifaceAddress :: String
@@ -150,9 +159,9 @@ testnet testnetOptions H.Conf {..} = do
   H.createDirectoryIfMissing logDir
 
   -- Choose one of the following fork methods:
-  forkMethod <- H.noteShow
-    ["TestShelleyHardForkAtVersion: 1"]
-    -- ["TestShelleyHardForkAtEpoch: 1"]
+  forkMethod <- H.noteShow $ case forkPoint testnetOptions of
+    AtVersion n -> ["TestShelleyHardForkAtVersion: " <> show @Int n]
+    AtEpoch n -> ["TestShelleyHardForkAtEpoch: " <> show @Int n]
 
   H.readFile (base </> "configuration/chairman/byron-shelley/configuration.yaml")
     <&> L.unlines . (<> forkMethod) . L.lines

diff --git a/cardano-node-chairman/testnet/Testnet/Commands/ByronShelley.hs b/cardano-node-chairman/testnet/Testnet/Commands/ByronShelley.hs
@@ -13,6 +13,7 @@ import           Options.Applicative
 import           System.IO (IO)
 import           Testnet.ByronShelley
 import           Testnet.Run (runTestnet)
+import           Text.Read (readEither)
 import           Text.Show
 
 import qualified Options.Applicative as OA
@@ -52,6 +53,13 @@ optsTestnet = TestnetOptions
       <>  OA.showDefault
       <>  OA.value (epochLength defaultTestnetOptions)
       )
+  <*> OA.option (OA.eitherReader readEither)
+      (   OA.long "fork-point"
+      <>  OA.help "Fork Point.  Valid values are: 'AtVersion <n>' and 'AtEpoch <n>'"
+      <>  OA.metavar "FORKPOINT"
+      <>  OA.showDefault
+      <>  OA.value (forkPoint defaultTestnetOptions)
+      )
 
 optsByronShelley :: Parser ByronShelleyOptions
 optsByronShelley = ByronShelleyOptions