move tx_template from chain to testenv

- update chain to use tx_template from testenv
- update imports in cargo.toml files
- update imports in test files
- update imports in testenv/src/lib.rs
- delete chain/tests/common/mod.rs file

[Issue: 1754]

Author: tvpeter

crates/chain/Cargo.toml

@@ -27,7 +27,7 @@ rusqlite = { version = "0.31.0", features = ["bundled"], optional = true }
 [dev-dependencies]
 rand = "0.8"
 proptest = "1.2.0"
-bdk_testenv = { path = "../testenv", default-features = false }
+bdk_testenv = { path = "../testenv", default-features = false, features = ["miniscript"] }
 criterion = { version = "0.2" }
 
 [features]

crates/chain/tests/common/mod.rs

@@ -1,8 +1,5 @@
 #![cfg(feature = "miniscript")]
 
-#[macro_use]
-mod common;
-
 use std::{collections::BTreeSet, sync::Arc};
 
 use bdk_chain::{

crates/chain/tests/test_indexed_tx_graph.rs

@@ -1,20 +1,21 @@
 #![cfg(feature = "miniscript")]
 
-#[macro_use]
-mod common;
 use bdk_chain::{collections::*, BlockId, ConfirmationBlockTime};
 use bdk_chain::{
     local_chain::LocalChain,
     tx_graph::{self, CalculateFeeError},
     tx_graph::{ChangeSet, TxGraph},
     Anchor, ChainOracle, ChainPosition, Merge,
 };
-use bdk_testenv::{block_id, hash, utils::new_tx};
+use bdk_testenv::{
+    block_id, hash,
+    tx_template::{init_graph, TxInTemplate, TxOutTemplate, TxTemplate},
+    utils::new_tx,
+};
 use bitcoin::{
     absolute, hashes::Hash, transaction, Amount, BlockHash, OutPoint, ScriptBuf, SignedAmount,
     Transaction, TxIn, TxOut, Txid,
 };
-use common::*;
 use core::iter;
 use rand::RngCore;
 use std::sync::Arc;

crates/chain/tests/test_tx_graph.rs

@@ -1,12 +1,11 @@
 #![cfg(feature = "miniscript")]
 
-#[macro_use]
-mod common;
-
 use bdk_chain::{Balance, BlockId};
-use bdk_testenv::{block_id, hash, local_chain};
+use bdk_testenv::{
+    block_id, hash, local_chain,
+    tx_template::{init_graph, TxInTemplate, TxOutTemplate, TxTemplate},
+};
 use bitcoin::{Amount, OutPoint, ScriptBuf};
-use common::*;
 use std::collections::{BTreeSet, HashSet};
 
 #[allow(dead_code)]

crates/chain/tests/test_tx_graph_conflicts.rs

@@ -18,15 +18,14 @@ workspace = true
 [dependencies]
 bdk_chain = { path = "../chain", version = "0.21.1", default-features = false }
 electrsd = { version = "0.28.0", features = [ "legacy" ], default-features = false }
-
-[dev-dependencies]
-bdk_testenv = { path = "." }
+rand = "0.8"
 
 [features]
 default = ["std", "download"]
 download = ["electrsd/bitcoind_25_0", "electrsd/esplora_a33e97e1"]
 std = ["bdk_chain/std"]
 serde = ["bdk_chain/serde"]
+miniscript = ["bdk_chain/miniscript"]
 
 [package.metadata.docs.rs]
-no-default-features = true
+no-default-features = true

crates/testenv/Cargo.toml

@@ -1,3 +1,4 @@
+pub mod tx_template;
 pub mod utils;
 
 use bdk_chain::{

crates/testenv/src/lib.rs

@@ -1,16 +1,19 @@
 #![cfg(feature = "miniscript")]
 
-use bdk_testenv::utils::DESCRIPTORS;
+use crate::utils::DESCRIPTORS;
+use bdk_chain::{
+    bitcoin::{
+        self, locktime::absolute::LockTime, secp256k1::Secp256k1, transaction, Amount, OutPoint,
+        ScriptBuf, Sequence, Transaction, TxIn, TxOut, Txid, Witness,
+    },
+    miniscript::Descriptor,
+    spk_txout::SpkTxOutIndex,
+    tx_graph::TxGraph,
+    Anchor,
+};
 use rand::distributions::{Alphanumeric, DistString};
 use std::collections::HashMap;
 
-use bdk_chain::{spk_txout::SpkTxOutIndex, tx_graph::TxGraph, Anchor};
-use bitcoin::{
-    locktime::absolute::LockTime, secp256k1::Secp256k1, transaction, Amount, OutPoint, ScriptBuf,
-    Sequence, Transaction, TxIn, TxOut, Txid, Witness,
-};
-use miniscript::Descriptor;
-
 /// Template for creating a transaction in `TxGraph`.
 ///
 /// The incentive for transaction templates is to create a transaction history in a simple manner to