Skip to content

Commit

Permalink
chore: fmt
Browse files Browse the repository at this point in the history
Signed-off-by: Lohachov Mykhailo <[email protected]>
  • Loading branch information
aoyako committed Nov 12, 2024
1 parent a252e68 commit c2a1b94
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
17 changes: 10 additions & 7 deletions crates/iroha/tests/extra_functional/connected_peers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,17 @@ async fn connected_peers_with_f(faults: usize) -> Result<()> {
.await?;
assert_peers_status(randomized_peers.iter().copied(), 2, n_peers as u64 - 2).await;

timeout(network.sync_timeout(),
async {
loop{
let status = removed_peer.status().await?;
if status.peers == 0 { break; }
// Wait for peer to disconnect
timeout(network.sync_timeout(), async {
loop {
let status = removed_peer.status().await?;
if status.peers == 0 {
break;
}
Ok::<(), eyre::Report>(())
}).await??;
}
Ok::<(), eyre::Report>(())
})
.await??;

let status = removed_peer.status().await?;
// Peer might have been disconnected before getting the block
Expand Down
2 changes: 1 addition & 1 deletion crates/iroha_test_network/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use iroha_crypto::{ExposedPrivateKey, KeyPair, PrivateKey};
use iroha_data_model::{
events::pipeline::BlockEventFilter,
isi::InstructionBox,
parameter::{SumeragiParameter, SumeragiParameters, SmartContractParameter},
parameter::{SmartContractParameter, SumeragiParameter, SumeragiParameters},
ChainId,
};
use iroha_genesis::GenesisBlock;
Expand Down
7 changes: 2 additions & 5 deletions crates/iroha_wasm_builder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl<'path, 'out_dir> Builder<'path, 'out_dir> {
|| -> Result<_> { Ok(Cow::Owned(Self::default_out_dir()?)) },
|out_dir| Ok(Cow::Borrowed(out_dir)),
)?,
show_output: self.show_output
show_output: self.show_output,
})
}

Expand Down Expand Up @@ -226,10 +226,7 @@ mod internal {
.retrieve_package_name()
.wrap_err("Failed to retrieve package name")?;

let full_out_dir = self
.out_dir
.join(format!("wasm32-unknown-unknown"))
.join("release");
let full_out_dir = self.out_dir.join("wasm32-unknown-unknown").join("release");
let wasm_file = full_out_dir.join(package_name).with_extension("wasm");

let previous_hash = if wasm_file.exists() {
Expand Down

0 comments on commit c2a1b94

Please sign in to comment.