From 3e6a37806f6bd7c1ffe8ed56b41712fff8566fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nurzhan=20Sak=C3=A9n?= <nurzhan.sakenov@gmail.com>
Date: Wed, 14 Aug 2024 12:45:37 +0400
Subject: [PATCH] fix: post-merge conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nurzhan Sakén <nurzhan.sakenov@gmail.com>
---
 iroha/benches/torii.rs                          | 2 +-
 iroha/src/client.rs                             | 2 +-
 iroha/tests/integration/multisig.rs             | 2 +-
 iroha/tests/integration/queries/account.rs      | 2 +-
 iroha/tests/integration/queries/query_errors.rs | 2 +-
 iroha/tests/integration/sorting.rs              | 2 +-
 iroha/tests/integration/tx_rollback.rs          | 2 +-
 iroha_core/src/smartcontracts/wasm.rs           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/iroha/benches/torii.rs b/iroha/benches/torii.rs
index efdd8ec5dc1..536e060fb71 100644
--- a/iroha/benches/torii.rs
+++ b/iroha/benches/torii.rs
@@ -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;
diff --git a/iroha/src/client.rs b/iroha/src/client.rs
index ece3888c30a..85fdcf9a84c 100644
--- a/iroha/src/client.rs
+++ b/iroha/src/client.rs
@@ -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};
diff --git a/iroha/tests/integration/multisig.rs b/iroha/tests/integration/multisig.rs
index 2178f42fa2a..8c60d456db9 100644
--- a/iroha/tests/integration/multisig.rs
+++ b/iroha/tests/integration/multisig.rs
@@ -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<()> {
diff --git a/iroha/tests/integration/queries/account.rs b/iroha/tests/integration/queries/account.rs
index 8d026dc4520..682ed0115d3 100644
--- a/iroha/tests/integration/queries/account.rs
+++ b/iroha/tests/integration/queries/account.rs
@@ -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<()> {
diff --git a/iroha/tests/integration/queries/query_errors.rs b/iroha/tests/integration/queries/query_errors.rs
index 741f0fccb06..ea3ead9574f 100644
--- a/iroha/tests/integration/queries/query_errors.rs
+++ b/iroha/tests/integration/queries/query_errors.rs
@@ -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() {
diff --git a/iroha/tests/integration/sorting.rs b/iroha/tests/integration/sorting.rs
index 18e37977b41..8173e936cf6 100644
--- a/iroha/tests/integration/sorting.rs
+++ b/iroha/tests/integration/sorting.rs
@@ -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]
diff --git a/iroha/tests/integration/tx_rollback.rs b/iroha/tests/integration/tx_rollback.rs
index f0d705468be..f022cda6867 100644
--- a/iroha/tests/integration/tx_rollback.rs
+++ b/iroha/tests/integration/tx_rollback.rs
@@ -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<()> {
diff --git a/iroha_core/src/smartcontracts/wasm.rs b/iroha_core/src/smartcontracts/wasm.rs
index 269735c2c77..fc6e85742ae 100644
--- a/iroha_core/src/smartcontracts/wasm.rs
+++ b/iroha_core/src/smartcontracts/wasm.rs
@@ -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::*;