Skip to content

Commit

Permalink
fix: post-merge conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Nurzhan Sakén <nurzhan.sakenov@gmail.com>
  • Loading branch information
nxsaken committed Aug 14, 2024
1 parent 3c17e06 commit 3e6a378
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion iroha/benches/torii.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ use iroha::{
};
use iroha_genesis::GenesisBuilder;
use iroha_primitives::unique_vec;
use iroha_test_samples::gen_account_in;
use irohad::samples::get_config;
use test_network::{
construct_executor, get_chain_id, get_key_pair, Peer as TestPeer, PeerBuilder, TestRuntime,
};
use test_samples::gen_account_in;
use tokio::runtime::Runtime;

const MINIMUM_SUCCESS_REQUEST_RATIO: f32 = 0.9;
Expand Down
2 changes: 1 addition & 1 deletion iroha/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ mod tests {
use std::str::FromStr;

use iroha_primitives::small::SmallStr;
use test_samples::gen_account_in;
use iroha_test_samples::gen_account_in;

use super::*;
use crate::config::{BasicAuth, Config, WebLogin};
Expand Down
2 changes: 1 addition & 1 deletion iroha/tests/integration/multisig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use iroha::{
},
};
use iroha_data_model::{parameter::SmartContractParameter, query::builder::SingleQueryError};
use iroha_test_samples::{gen_account_in, ALICE_ID};
use nonzero_ext::nonzero;
use test_network::*;
use test_samples::{gen_account_in, ALICE_ID};

#[test]
fn mutlisig() -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion iroha/tests/integration/queries/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::{collections::HashSet, str::FromStr as _};

use eyre::Result;
use iroha::{client, data_model::prelude::*};
use iroha_test_samples::{gen_account_in, ALICE_ID};
use test_network::*;
use test_samples::{gen_account_in, ALICE_ID};

#[test]
fn find_accounts_with_asset() -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion iroha/tests/integration/queries/query_errors.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use iroha::client;
use iroha_data_model::{prelude::QueryBuilderExt, query::builder::SingleQueryError};
use test_samples::gen_account_in;
use iroha_test_samples::gen_account_in;

#[test]
fn non_existent_account_is_specific_error() {
Expand Down
2 changes: 1 addition & 1 deletion iroha/tests/integration/sorting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use iroha::{
data_model::{account::Account, prelude::*},
};
use iroha_data_model::query::predicate::predicate_atoms::asset::AssetPredicateBox;
use iroha_test_samples::ALICE_ID;
use nonzero_ext::nonzero;
use rand::{seq::SliceRandom, thread_rng};
use test_network::*;
use test_samples::ALICE_ID;

#[test]
#[ignore]
Expand Down
2 changes: 1 addition & 1 deletion iroha/tests/integration/tx_rollback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::str::FromStr as _;

use eyre::Result;
use iroha::{client, data_model::prelude::*};
use iroha_test_samples::ALICE_ID;
use test_network::*;
use test_samples::ALICE_ID;

#[test]
fn client_sends_transaction_with_invalid_instruction_should_not_see_any_changes() -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion iroha_core/src/smartcontracts/wasm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1699,9 +1699,9 @@ impl<C: wasmtime::AsContextMut> GetExport for (&wasmtime::Instance, C) {

#[cfg(test)]
mod tests {
use iroha_test_samples::gen_account_in;
use nonzero_ext::nonzero;
use parity_scale_codec::Encode;
use test_samples::gen_account_in;
use tokio::test;

use super::*;
Expand Down

0 comments on commit 3e6a378

Please sign in to comment.