Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused capability to configure bitcoind docker version tag

Browse Source 
We only use one version of this container
This commit is contained in:
rishflab 2021-03-12 12:50:42 +11:00
parent 7b1d901ea0
commit 9f534996ee
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swap/tests/testutils/bitcoind.rs
View File

@ -10,7 +10,6 @@ pub const DATADIR: &str = "/home/bdk";
#[derive(Debug)] #[derive(Debug)]
pub struct Bitcoind { pub struct Bitcoind {
tag: String,
args: BitcoindArgs, args: BitcoindArgs,
entrypoint: Option<String>, entrypoint: Option<String>,
volume: Option<String>, volume: Option<String>,
@ -23,7 +22,7 @@ impl Image for Bitcoind {
type EntryPoint = str; type EntryPoint = str;
fn descriptor(&self) -> String { fn descriptor(&self) -> String {
format!("coblox/bitcoin-core:{}", self.tag) "coblox/bitcoin-core:0.21.0".to_string()
} }
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) { fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
@ -72,7 +71,6 @@ impl Image for Bitcoind {
impl Default for Bitcoind { impl Default for Bitcoind {
fn default() -> Self { fn default() -> Self {
Bitcoind { Bitcoind {
tag: "0.19.1".into(),
args: BitcoindArgs::default(), args: BitcoindArgs::default(),
entrypoint: Some("/usr/bin/bitcoind".into()), entrypoint: Some("/usr/bin/bitcoind".into()),
volume: None, volume: None,
@ -81,13 +79,6 @@ impl Default for Bitcoind {
} }
impl Bitcoind { impl Bitcoind {
pub fn with_tag(self, tag_str: &str) -> Self {
Bitcoind {
tag: tag_str.to_string(),
..self
}
}
pub fn with_volume(mut self, volume: String) -> Self { pub fn with_volume(mut self, volume: String) -> Self {
self.volume = Some(volume); self.volume = Some(volume);
self self

4
swap/tests/testutils/mod.rs
View File

@ -468,9 +468,7 @@ async fn init_bitcoind_container(
name: String, name: String,
network: String, network: String,
) -> Result<(Container<'_, Cli, bitcoind::Bitcoind>, Url)> { ) -> Result<(Container<'_, Cli, bitcoind::Bitcoind>, Url)> {
let image = bitcoind::Bitcoind::default() let image = bitcoind::Bitcoind::default().with_volume(volume);
.with_volume(volume)
.with_tag("0.19.1");
let run_args = RunArgs::default().with_name(name).with_network(network); let run_args = RunArgs::default().with_name(name).with_network(network);