Fix parseFraction so that it will parse a Double but convert it to a

`Rational` as required Update `./scripts/genesis.sh` to reflect the above change.
IntersectMBO · Feb 14, 2020 · f4e5cc6 · f4e5cc6
1 parent cd9ef4d
commit f4e5cc6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/cardano-node/src/Cardano/CLI/Parsers.hs b/cardano-node/src/Cardano/CLI/Parsers.hs
@@ -298,26 +298,27 @@ parseLovelace optname desc =
 
 parseFraction :: String -> String -> Parser Rational
 parseFraction optname desc =
-  option readFraction $
+  option (toRational <$> readDouble) $
       long optname
-   <> metavar "INT"
+   <> metavar "DOUBLE"
    <> help desc
   where
 
 parseFractionWithDefault
   :: String
   -> String
-  -> Rational
+  -> Double
   -> Parser Rational
 parseFractionWithDefault optname desc w =
-  option readFraction $
-      long optname
-   <> metavar "INT"
-   <> help desc
-   <> value w
+  toRational <$> ( option readDouble
+                 $ long optname
+                <> metavar "DOUBLE"
+                <> help desc
+                <> value w
+                )
 
-readFraction :: ReadM Rational
-readFraction = do
+readDouble :: ReadM Double
+readDouble = do
   f <- auto
   when (f < 0) $ readerError "fraction must be >= 0"
   when (f > 1) $ readerError "fraction must be <= 1"

diff --git a/scripts/genesis.sh b/scripts/genesis.sh
@@ -25,7 +25,7 @@ protocol_magic=459045235
 n_poors=128
 n_delegates=7
 total_balance=8000000000000000
-delegate_share=900000000000000
+delegate_share=0.9
 avvm_entries=128
 avvm_entry_balance=10000000000000
 not_so_secret=2718281828
@@ -35,16 +35,16 @@ args=(
       --genesis-output-dir           "${tmpdir}"
       --start-time                   "${start_time}"
       --protocol-parameters-file     "${protocol_params}"
-      --k                            ${parameter_k}
-      --protocol-magic               ${protocol_magic}
-      --n-poor-addresses             ${n_poors}
-      --n-delegate-addresses         ${n_delegates}
-      --total-balance                ${total_balance}
-      --delegate-share               ${delegate_share}
-      --avvm-entry-count             ${avvm_entries}
-      --avvm-entry-balance           ${avvm_entry_balance}
+      --k                            "${parameter_k}"
+      --protocol-magic               "${protocol_magic}"
+      --n-poor-addresses             "${n_poors}"
+      --n-delegate-addresses         "${n_delegates}"
+      --total-balance                "${total_balance}"
+      --avvm-entry-count             "${avvm_entries}"
+      --avvm-entry-balance           "${avvm_entry_balance}"
+      --delegate-share               "${delegate_share}"
       --real-pbft
-      --secret-seed                  ${not_so_secret}
+      --secret-seed                  "${not_so_secret}"
 )
 
 set -xe