Skip to content

Commit 9442381

Browse files
committed
feat: add latest shortcut as targeted era for Cardano CLI commands
1 parent 49a411c commit 9442381

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

mithril-common/src/chain_observer/cli_observer.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ impl CardanoCliRunner {
6666
fn command_for_utxo(&self, address: &str, out_file: PathBuf) -> Command {
6767
let mut command = self.get_command();
6868
command
69+
.arg("latest")
6970
.arg("query")
7071
.arg("utxo")
7172
.arg("--address")
@@ -79,7 +80,7 @@ impl CardanoCliRunner {
7980

8081
fn command_for_stake_distribution(&self) -> Command {
8182
let mut command = self.get_command();
82-
command.arg("query").arg("stake-distribution");
83+
command.arg("latest").arg("query").arg("stake-distribution");
8384
self.post_config_command(&mut command);
8485

8586
command
@@ -88,6 +89,7 @@ impl CardanoCliRunner {
8889
fn command_for_stake_snapshot(&self, stake_pool_id: &str) -> Command {
8990
let mut command = self.get_command();
9091
command
92+
.arg("latest")
9193
.arg("query")
9294
.arg("stake-snapshot")
9395
.arg("--stake-pool-id")
@@ -100,6 +102,7 @@ impl CardanoCliRunner {
100102
fn command_for_stake_snapshot_all_pools(&self) -> Command {
101103
let mut command = self.get_command();
102104
command
105+
.arg("latest")
103106
.arg("query")
104107
.arg("stake-snapshot")
105108
.arg("--all-stake-pools");
@@ -110,15 +113,15 @@ impl CardanoCliRunner {
110113

111114
fn command_for_epoch(&self) -> Command {
112115
let mut command = self.get_command();
113-
command.arg("query").arg("tip");
116+
command.arg("latest").arg("query").arg("tip");
114117
self.post_config_command(&mut command);
115118

116119
command
117120
}
118121

119122
fn command_for_chain_point(&self) -> Command {
120123
let mut command = self.get_command();
121-
command.arg("query").arg("tip");
124+
command.arg("latest").arg("query").arg("tip");
122125
self.post_config_command(&mut command);
123126

124127
command
@@ -127,6 +130,7 @@ impl CardanoCliRunner {
127130
fn command_for_kes_period(&self, opcert_file: &str) -> Command {
128131
let mut command = self.get_command();
129132
command
133+
.arg("latest")
130134
.arg("query")
131135
.arg("kes-period-info")
132136
.arg("--op-cert-file")
@@ -556,8 +560,8 @@ mod tests {
556560
CardanoNetwork::TestNet(10),
557561
);
558562

559-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
560-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
563+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
564+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--testnet-magic\" \"10\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
561565
}
562566

563567
#[tokio::test]
@@ -568,8 +572,8 @@ mod tests {
568572
CardanoNetwork::DevNet(25),
569573
);
570574

571-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
572-
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
575+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_epoch()));
576+
assert_eq!("Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--cardano-mode\" \"--testnet-magic\" \"25\", kill_on_drop: false }", format!("{:?}", runner.command_for_stake_distribution()));
573577
}
574578

575579
#[tokio::test]
@@ -581,11 +585,11 @@ mod tests {
581585
);
582586

583587
assert_eq!(
584-
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"tip\" \"--mainnet\", kill_on_drop: false }",
588+
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"tip\" \"--mainnet\", kill_on_drop: false }",
585589
format!("{:?}", runner.command_for_epoch())
586590
);
587591
assert_eq!(
588-
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"query\" \"stake-distribution\" \"--mainnet\", kill_on_drop: false }",
592+
"Command { std: CARDANO_NODE_SOCKET_PATH=\"/tmp/whatever.sock\" \"cardano-cli\" \"latest\" \"query\" \"stake-distribution\" \"--mainnet\", kill_on_drop: false }",
589593
format!("{:?}", runner.command_for_stake_distribution())
590594
);
591595
}

mithril-test-lab/mithril-devnet/query-cardano.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/usr/bin/env bash
22

33
echo ">> Query chain tip"
4-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query tip \
4+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query tip \
55
--cardano-mode \
66
--testnet-magic 42 | jq .
77

88
echo
99
echo ">> Query whole utxo"
10-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query utxo \
10+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query utxo \
1111
--cardano-mode \
1212
--testnet-magic 42 \
1313
--whole-utxo
1414
echo
1515

1616
echo ">> Query stake pools"
17-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query stake-pools \
17+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query stake-pools \
1818
--cardano-mode \
1919
--testnet-magic 42
2020
echo
2121

2222
echo ">> Query stake distribution"
23-
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli query stake-snapshot --all-stake-pools \
23+
CARDANO_NODE_SOCKET_PATH=node-pool1/ipc/node.sock ./cardano-cli latest query stake-snapshot --all-stake-pools \
2424
--cardano-mode \
2525
--testnet-magic 42 | jq .
2626
echo

0 commit comments

Comments
 (0)