Skip to content

Commit 87b4347

Browse files
dlachaumedlachaume
committed
chore: configure with chain_width=70 (default to 60)
1 parent a4da217 commit 87b4347

File tree

234 files changed

+957
-2618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+957
-2618
lines changed

‎demo/protocol-demo/src/demonstrator.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ impl Party {
108108
}
109109
let closed_reg = key_reg.close();
110110

111-
let signer = self
112-
.initializer
113-
.clone()
114-
.unwrap()
115-
.new_signer(closed_reg)
116-
.unwrap();
111+
let signer = self.initializer.clone().unwrap().new_signer(closed_reg).unwrap();
117112
self.signer = Some(signer);
118113
self.clerk = Some(ProtocolClerk::from_signer(self.signer.as_ref().unwrap()));
119114
}
@@ -446,12 +441,7 @@ impl ProtocolDemonstrator for Demonstrator {
446441
Err(err) => return Err(err),
447442
}
448443
let msig = party.get_aggregate(message).unwrap();
449-
match self
450-
.verifier
451-
.as_ref()
452-
.unwrap()
453-
.verify_message(message, msig)
454-
{
444+
match self.verifier.as_ref().unwrap().verify_message(message, msig) {
455445
Ok(_) => (),
456446
Err(err) => return Err(err),
457447
}

‎examples/client-cardano-database-v2/src/main.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,9 @@ async fn main() -> MithrilResult<()> {
7070
.hash
7171
.as_ref();
7272

73-
let cardano_database_snapshot =
74-
client
75-
.cardano_database_v2()
76-
.get(latest_hash)
77-
.await?
78-
.ok_or(anyhow!(
79-
"A Cardano database should exist for hash '{latest_hash}'"
80-
))?;
73+
let cardano_database_snapshot = client.cardano_database_v2().get(latest_hash).await?.ok_or(
74+
anyhow!("A Cardano database should exist for hash '{latest_hash}'"),
75+
)?;
8176

8277
let unpacked_dir = work_dir.join("unpack");
8378
std::fs::create_dir(&unpacked_dir).unwrap();

‎examples/client-cardano-database/src/main.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ async fn main() -> MithrilResult<()> {
7878
let unpacked_dir = work_dir.join("unpack");
7979
std::fs::create_dir(&unpacked_dir).unwrap();
8080

81-
let certificate = client
82-
.certificate()
83-
.verify_chain(&snapshot.certificate_hash)
84-
.await?;
81+
let certificate = client.certificate().verify_chain(&snapshot.certificate_hash).await?;
8582

8683
client
8784
.cardano_database()
@@ -240,9 +237,7 @@ impl FeedbackReceiver for IndicatifFeedbackReceiver {
240237
}
241238

242239
fn get_temp_dir() -> MithrilResult<PathBuf> {
243-
let dir = std::env::temp_dir()
244-
.join("mithril_examples")
245-
.join("client_snapshot");
240+
let dir = std::env::temp_dir().join("mithril_examples").join("client_snapshot");
246241

247242
if dir.exists() {
248243
std::fs::remove_dir_all(&dir).with_context(|| format!("Could not remove dir {dir:?}"))?;

‎internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/cli_observer.rs

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ impl CardanoCliRunner {
8686

8787
fn command_for_stake_distribution(&self) -> Command {
8888
let mut command = self.get_command();
89-
command
90-
.arg(CARDANO_ERA)
91-
.arg("query")
92-
.arg("stake-distribution");
89+
command.arg(CARDANO_ERA).arg("query").arg("stake-distribution");
9390
self.post_config_command(&mut command);
9491

9592
command
@@ -186,10 +183,7 @@ impl CardanoCliRunner {
186183
impl CliRunner for CardanoCliRunner {
187184
async fn launch_utxo(&self, address: &str) -> StdResult<String> {
188185
let out_file = Self::random_out_file()?;
189-
let output = self
190-
.command_for_utxo(address, out_file.clone())
191-
.output()
192-
.await?;
186+
let output = self.command_for_utxo(address, out_file.clone()).output().await?;
193187

194188
if output.status.success() {
195189
Ok(fs::read_to_string(out_file)?.trim().to_string())
@@ -221,10 +215,7 @@ impl CliRunner for CardanoCliRunner {
221215
}
222216

223217
async fn launch_stake_snapshot(&self, stake_pool_id: &str) -> StdResult<String> {
224-
let output = self
225-
.command_for_stake_snapshot(stake_pool_id)
226-
.output()
227-
.await?;
218+
let output = self.command_for_stake_snapshot(stake_pool_id).output().await?;
228219

229220
if output.status.success() {
230221
Ok(std::str::from_utf8(&output.stdout)?.trim().to_string())
@@ -795,11 +786,8 @@ mod tests {
795786
.await
796787
.unwrap()
797788
.unwrap();
798-
let computed_stake_distribution = observer
799-
.get_current_stake_distribution()
800-
.await
801-
.unwrap()
802-
.unwrap();
789+
let computed_stake_distribution =
790+
observer.get_current_stake_distribution().await.unwrap().unwrap();
803791

804792
assert_eq!(
805793
BTreeMap::from_iter(
@@ -823,11 +811,8 @@ mod tests {
823811
.await
824812
.unwrap()
825813
.unwrap();
826-
let computed_stake_distribution = observer
827-
.get_current_stake_distribution()
828-
.await
829-
.unwrap()
830-
.unwrap();
814+
let computed_stake_distribution =
815+
observer.get_current_stake_distribution().await.unwrap().unwrap();
831816

832817
assert_eq!(
833818
BTreeMap::from_iter(

‎internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/pallas_observer.rs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,9 @@ impl PallasChainObserver {
141141
.utxo
142142
.iter()
143143
.filter_map(|(_, utxo)| match utxo {
144-
TransactionOutput::Current(output) => output
145-
.inline_datum
146-
.as_ref()
147-
.map(|_| self.serialize_datum(output)),
144+
TransactionOutput::Current(output) => {
145+
output.inline_datum.as_ref().map(|_| self.serialize_datum(output))
146+
}
148147
_ => None,
149148
})
150149
.collect::<StdResult<Datums>>()
@@ -834,10 +833,7 @@ mod tests {
834833
let mut client = observer.get_client().await.unwrap();
835834
let statequery = client.statequery();
836835
statequery.acquire(None).await.unwrap();
837-
let chain_point = observer
838-
.do_get_chain_point_state_query(statequery)
839-
.await
840-
.unwrap();
836+
let chain_point = observer.do_get_chain_point_state_query(statequery).await.unwrap();
841837
observer.post_process_statequery(&mut client).await.unwrap();
842838
client.abort().await;
843839
chain_point
@@ -858,10 +854,8 @@ mod tests {
858854
let mut client = observer.get_client().await.unwrap();
859855
let statequery = client.statequery();
860856
statequery.acquire(None).await.unwrap();
861-
let genesis_config = observer
862-
.do_get_genesis_config_state_query(statequery)
863-
.await
864-
.unwrap();
857+
let genesis_config =
858+
observer.do_get_genesis_config_state_query(statequery).await.unwrap();
865859
observer.post_process_statequery(&mut client).await.unwrap();
866860
client.abort().await;
867861
genesis_config
@@ -882,10 +876,7 @@ mod tests {
882876
let mut client = observer.get_client().await.unwrap();
883877
let statequery = client.statequery();
884878
statequery.acquire(None).await.unwrap();
885-
let era = observer
886-
.do_get_current_era_state_query(statequery)
887-
.await
888-
.unwrap();
879+
let era = observer.do_get_current_era_state_query(statequery).await.unwrap();
889880
observer.post_process_statequery(&mut client).await.unwrap();
890881
client.abort().await;
891882
era

‎internal/cardano-node/mithril-cardano-node-chain/src/chain_reader/pallas_chain_reader.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ impl PallasChainReader {
8080

8181
if chainsync.has_agency() {
8282
debug!(logger, "Has agency, finding intersect point..."; "point" => ?point);
83-
chainsync
84-
.find_intersect(vec![point.to_owned().into()])
85-
.await?;
83+
chainsync.find_intersect(vec![point.to_owned().into()]).await?;
8684
} else {
8785
debug!(logger, "Doesn't have agency, no need to find intersect point";);
8886
}

‎internal/cardano-node/mithril-cardano-node-chain/src/test/double/block_scanner.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,8 @@ impl DumbBlockStreamer {
104104
/// Add to the streamer several [ChainScannedBlocks::RollForwards] responses at the end of
105105
/// its queue.
106106
pub fn forwards(mut self, blocks: Vec<Vec<ScannedBlock>>) -> Self {
107-
let mut source: VecDeque<_> = blocks
108-
.into_iter()
109-
.map(ChainScannedBlocks::RollForwards)
110-
.collect();
107+
let mut source: VecDeque<_> =
108+
blocks.into_iter().map(ChainScannedBlocks::RollForwards).collect();
111109
self.streamer_responses.append(&mut source);
112110

113111
self

‎internal/cardano-node/mithril-cardano-node-chain/src/test/double/chain_observer.rs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ impl FakeChainObserver {
8282
..time_point.clone()
8383
});
8484

85-
current_time_point
86-
.as_ref()
87-
.map(|b| b.chain_point.block_number)
85+
current_time_point.as_ref().map(|b| b.chain_point.block_number)
8886
}
8987

9088
/// Increase the slot number of the [current_time_point][`FakeChainObserver::current_time_point`] by
@@ -115,9 +113,7 @@ impl FakeChainObserver {
115113
..time_point.clone()
116114
});
117115

118-
current_time_point
119-
.as_ref()
120-
.map(|b| b.chain_point.slot_number)
116+
current_time_point.as_ref().map(|b| b.chain_point.slot_number)
121117
}
122118

123119
/// Set the signers that will use to compute the result of
@@ -232,9 +228,7 @@ mod tests {
232228
#[tokio::test]
233229
async fn test_get_current_chain_point() {
234230
let fake_observer = FakeChainObserver::new(None);
235-
fake_observer
236-
.set_current_time_point(Some(TimePoint::dummy()))
237-
.await;
231+
fake_observer.set_current_time_point(Some(TimePoint::dummy())).await;
238232
let chain_point = fake_observer.get_current_chain_point().await.unwrap();
239233

240234
assert_eq!(
@@ -247,9 +241,7 @@ mod tests {
247241
#[tokio::test]
248242
async fn test_get_current_stake_distribution() {
249243
let fake_observer = FakeChainObserver::new(None);
250-
fake_observer
251-
.set_signers(fake_data::signers_with_stakes(2))
252-
.await;
244+
fake_observer.set_signers(fake_data::signers_with_stakes(2)).await;
253245
let stake_distribution = fake_observer.get_current_stake_distribution().await;
254246

255247
assert_eq!(
@@ -277,9 +269,7 @@ mod tests {
277269
#[tokio::test]
278270
async fn test_increase_block_number() {
279271
let fake_observer = FakeChainObserver::new(None);
280-
fake_observer
281-
.set_current_time_point(Some(TimePoint::dummy()))
282-
.await;
272+
fake_observer.set_current_time_point(Some(TimePoint::dummy())).await;
283273
fake_observer.increase_block_number(375).await;
284274

285275
let chain_point = fake_observer.get_current_chain_point().await.unwrap();
@@ -321,9 +311,7 @@ mod tests {
321311
#[tokio::test]
322312
async fn test_increase_slot_number() {
323313
let fake_observer = FakeChainObserver::new(None);
324-
fake_observer
325-
.set_current_time_point(Some(TimePoint::dummy()))
326-
.await;
314+
fake_observer.set_current_time_point(Some(TimePoint::dummy())).await;
327315
fake_observer.increase_slot_number(375).await;
328316

329317
let chain_point = fake_observer.get_current_chain_point().await.unwrap();

‎internal/cardano-node/mithril-cardano-node-internal-database/benches/digester.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ use mithril_cardano_node_internal_database::IMMUTABLE_DIR;
1919
use mithril_common::entities::{CardanoDbBeacon, ImmutableFileNumber};
2020

2121
fn temp_dir() -> PathBuf {
22-
std::env::temp_dir()
23-
.join("mithril_benches")
24-
.join("digester")
22+
std::env::temp_dir().join("mithril_benches").join("digester")
2523
}
2624

2725
fn db_dir() -> PathBuf {

‎internal/cardano-node/mithril-cardano-node-internal-database/src/digesters/cache/json_provider.rs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,7 @@ mod tests {
144144
.store(values_to_store)
145145
.await
146146
.expect("Cache write should not fail");
147-
let result = provider
148-
.get(immutables)
149-
.await
150-
.expect("Cache read should not fail");
147+
let result = provider.get(immutables).await.expect("Cache read should not fail");
151148

152149
assert_eq!(expected, result);
153150
}
@@ -170,10 +167,7 @@ mod tests {
170167
)]);
171168
let immutables = expected.keys().cloned().collect();
172169

173-
let result = provider
174-
.get(immutables)
175-
.await
176-
.expect("Cache read should not fail");
170+
let result = provider.get(immutables).await.expect("Cache read should not fail");
177171

178172
assert_eq!(expected, result);
179173
}
@@ -193,10 +187,7 @@ mod tests {
193187
)]);
194188
let immutables = expected.keys().cloned().collect();
195189

196-
let result = provider
197-
.get(immutables)
198-
.await
199-
.expect("Cache read should not fail");
190+
let result = provider.get(immutables).await.expect("Cache read should not fail");
200191

201192
assert_eq!(expected, result);
202193
}
@@ -241,10 +232,7 @@ mod tests {
241232
.store(values_to_store)
242233
.await
243234
.expect("Cache write should not fail");
244-
let result = provider
245-
.get(immutables)
246-
.await
247-
.expect("Cache read should not fail");
235+
let result = provider.get(immutables).await.expect("Cache read should not fail");
248236

249237
assert_eq!(expected, result);
250238
}
@@ -275,10 +263,8 @@ mod tests {
275263
.expect("Cache write should not fail");
276264
provider.reset().await.expect("reset should not fails");
277265

278-
let result: BTreeMap<_, _> = provider
279-
.get(immutables)
280-
.await
281-
.expect("Cache read should not fail");
266+
let result: BTreeMap<_, _> =
267+
provider.get(immutables).await.expect("Cache read should not fail");
282268

283269
assert!(result.into_iter().all(|(_, cache)| cache.is_none()));
284270
}

0 commit comments

Comments
 (0)