Skip to content

Commit

Permalink
Merge #1978
Browse files Browse the repository at this point in the history
1978: Tweak CLI help for --mainnet r=rvl a=rvl

### Issue Number

ADP-356

### Overview

- Add CLI help for the `--mainnet` option.
- Fix some fixmes left over from refactors.

### Comments

- [Wiki](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface#serve) is updated.


Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
  • Loading branch information
iohk-bors[bot] and rvl committed Jul 30, 2020
2 parents 4f51038 + b2d2db2 commit ac9e1d0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion lib/byron/src/Cardano/Wallet/Byron/Compatibility.hs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ testnetVersionData pm =
--
-- Type Conversions

-- fixme: maybe just toByronHash = ByronHash . CC.unsafeHashFromBytes
toByronHash :: W.Hash "BlockHeader" -> ByronHash
toByronHash (W.Hash bytes) =
case CC.hashFromBytes bytes of
Expand Down
2 changes: 0 additions & 2 deletions lib/core/src/Cardano/Wallet/Primitive/Slotting.hs
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ slotAtTimeDetailed t = do
--
-- This may or may not be what we actually want.
--
-- fixme: this rank-2 type is inconvenient to set up in network layer.
-- fixme: this is backend-specific code -- it should be moved to the shelley package.
type TimeInterpreter m = forall a. Qry a -> m a

-- | An 'Interpreter' for a single era, where the slotting from
Expand Down
1 change: 0 additions & 1 deletion lib/shelley/src/Cardano/Wallet/Byron/Compatibility.hs
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ testnetVersionData pm =
--
-- Type Conversions

-- fixme: maybe just toByronHash = ByronHash . CC.unsafeHashFromBytes
toByronHash :: W.Hash "BlockHeader" -> ByronHash
toByronHash (W.Hash bytes) =
case CC.hashFromBytes bytes of
Expand Down
4 changes: 3 additions & 1 deletion lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ networkConfigurationOption = mainnet <|> testnet <|> staging
testnet = TestnetConfig <$> genesisFileOption "byron" "testnet"
staging = StagingConfig <$> genesisFileOption "byron" "staging"

mainnetFlag = flag' MainnetConfig (long "mainnet")
mainnetFlag = flag' MainnetConfig $ mempty
<> long "mainnet"
<> help "Use Cardano mainnet protocol"

genesisFileOption :: String -> String -> Parser FilePath
genesisFileOption era net = optionT $ mempty
Expand Down
2 changes: 1 addition & 1 deletion lib/shelley/src/Cardano/Wallet/Shelley/Network.hs
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ withNetworkLayer tr np addrInfo versionData action = do
SubmitSuccess -> pure ()
SubmitFail err -> throwE $ ErrPostTxBadRequest $ T.pack (show err)

-- fixme: only shelley transactions can be submitted like this, because they
-- NOTE: only shelley transactions can be submitted like this, because they
-- are deserialised as shelley transactions before submitting.
_postSealedTx localTxSubmissionQ tx = do
liftIO $ traceWith tr $ MsgPostSealedTx tx
Expand Down

0 comments on commit ac9e1d0

Please sign in to comment.