From b7247f4b705ea5eb6359872b9563421b80bfb3af Mon Sep 17 00:00:00 2001
From: Jake Hartnell <jake.hartnell@gmail.com>
Date: Mon, 30 Oct 2023 20:39:43 +0100
Subject: [PATCH] Rebase cleanup, fix up tests

---
 .../src/testing/test_tube_env.rs                      |  8 ++++++--
 .../src/tests/test_tube/integration_tests.rs          | 11 ++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs b/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs
index c9d462213..226195f8a 100644
--- a/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs
+++ b/contracts/voting/dao-voting-cw721-staked/src/testing/test_tube_env.rs
@@ -24,8 +24,12 @@ use dao_testing::test_tube::{
 };
 use dao_voting::threshold::ActiveThreshold;
 use osmosis_test_tube::{
-    osmosis_std::types::cosmwasm::wasm::v1::MsgExecuteContractResponse, Account, Bank, Module,
-    OsmosisTestApp, RunnerError, RunnerExecuteResult, RunnerResult, SigningAccount, Wasm,
+    osmosis_std::types::{
+        cosmos::bank::v1beta1::QueryAllBalancesRequest,
+        cosmwasm::wasm::v1::MsgExecuteContractResponse,
+    },
+    Account, Bank, Module, OsmosisTestApp, RunnerError, RunnerExecuteResult, RunnerResult,
+    SigningAccount, Wasm,
 };
 use serde::de::DeserializeOwned;
 use std::path::PathBuf;
diff --git a/contracts/voting/dao-voting-token-staked/src/tests/test_tube/integration_tests.rs b/contracts/voting/dao-voting-token-staked/src/tests/test_tube/integration_tests.rs
index 77effcda6..926abe763 100644
--- a/contracts/voting/dao-voting-token-staked/src/tests/test_tube/integration_tests.rs
+++ b/contracts/voting/dao-voting-token-staked/src/tests/test_tube/integration_tests.rs
@@ -1,8 +1,3 @@
-use crate::{
-    msg::{ExecuteMsg, InstantiateMsg, QueryMsg, TokenInfo},
-    tests::test_tube::test_env::TokenVotingContract,
-    ContractError,
-};
 use cosmwasm_std::{to_json_binary, Addr, Coin, Decimal, Uint128, WasmMsg};
 use cw_ownable::Ownership;
 use cw_tokenfactory_issuer::msg::{DenomUnit, QueryMsg as IssuerQueryMsg};
@@ -22,6 +17,12 @@ use osmosis_test_tube::{
     RunnerError,
 };
 
+use crate::{
+    msg::{ExecuteMsg, InstantiateMsg, QueryMsg, TokenInfo},
+    tests::test_tube::test_env::TokenVotingContract,
+    ContractError,
+};
+
 use super::test_env::{TestEnv, TestEnvBuilder, DENOM};
 
 #[test]