@@ -16,13 +16,11 @@ pub trait CliRunner {
1616}
1717
1818/// Cardano Network identifier
19- ///
20- /// Clippy is unhappy when all variant names have the same suffix
21- /// `MainNet` has therefor been renamed to `Main`, `DevNet` to `Dev` etc.
19+ #[ allow( clippy:: enum_variant_names) ]
2220enum CardanoCliNetwork {
23- Main ,
24- Dev ( u64 ) ,
25- Test ( u64 ) ,
21+ MainNet ,
22+ DevNet ( u64 ) ,
23+ TestNet ( u64 ) ,
2624}
2725
2826struct CardanoCliRunner {
@@ -68,11 +66,11 @@ impl CardanoCliRunner {
6866
6967 fn post_config_command < ' a > ( & ' a self , command : & ' a mut Command ) -> & mut Command {
7068 match self . network {
71- CardanoCliNetwork :: Main => command. arg ( "--mainnet" ) ,
72- CardanoCliNetwork :: Dev ( magic) => command
69+ CardanoCliNetwork :: MainNet => command. arg ( "--mainnet" ) ,
70+ CardanoCliNetwork :: DevNet ( magic) => command
7371 . arg ( format ! ( "--testnet-magic {}" , magic) )
7472 . arg ( "--cardano-mode" ) ,
75- CardanoCliNetwork :: Test ( magic) => command. arg ( format ! ( "--testnet-magic {}" , magic) ) ,
73+ CardanoCliNetwork :: TestNet ( magic) => command. arg ( format ! ( "--testnet-magic {}" , magic) ) ,
7674 }
7775 }
7876}
@@ -227,7 +225,7 @@ pool1qz2vzszautc2c8mljnqre2857dpmheq7kgt6vav0s38tvvhxm6w 1.051e-6
227225 let runner = CardanoCliRunner :: new (
228226 PathBuf :: new ( ) . join ( "cardano-cli" ) ,
229227 PathBuf :: new ( ) . join ( "/tmp/whatever.sock" ) ,
230- CardanoCliNetwork :: Test ( 10 ) ,
228+ CardanoCliNetwork :: TestNet ( 10 ) ,
231229 ) ;
232230
233231 assert_eq ! ( "Command { std: \" cardano-cli\" \" query\" \" tip\" \" --testnet-magic 10\" , kill_on_drop: false }" , format!( "{:?}" , runner. command_for_epoch( ) ) ) ;
@@ -239,7 +237,7 @@ pool1qz2vzszautc2c8mljnqre2857dpmheq7kgt6vav0s38tvvhxm6w 1.051e-6
239237 let runner = CardanoCliRunner :: new (
240238 PathBuf :: new ( ) . join ( "cardano-cli" ) ,
241239 PathBuf :: new ( ) . join ( "/tmp/whatever.sock" ) ,
242- CardanoCliNetwork :: Dev ( 25 ) ,
240+ CardanoCliNetwork :: DevNet ( 25 ) ,
243241 ) ;
244242
245243 assert_eq ! ( "Command { std: \" cardano-cli\" \" query\" \" tip\" \" --testnet-magic 25\" \" --cardano-mode\" , kill_on_drop: false }" , format!( "{:?}" , runner. command_for_epoch( ) ) ) ;
@@ -251,7 +249,7 @@ pool1qz2vzszautc2c8mljnqre2857dpmheq7kgt6vav0s38tvvhxm6w 1.051e-6
251249 let runner = CardanoCliRunner :: new (
252250 PathBuf :: new ( ) . join ( "cardano-cli" ) ,
253251 PathBuf :: new ( ) . join ( "/tmp/whatever.sock" ) ,
254- CardanoCliNetwork :: Main ,
252+ CardanoCliNetwork :: MainNet ,
255253 ) ;
256254
257255 assert_eq ! (
0 commit comments