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

Merge #308

Browse Source 
308: Fix incorrect docker tag r=thomaseizinger a=rishflab



Co-authored-by: rishflab <rishflab@hotmail.com>
This commit is contained in:
bors[bot] 2021-03-12 07:45:18 +00:00 committed by GitHub
commit 3a5d8aee42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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: "v0.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
@ -107,8 +98,6 @@ impl IntoIterator for BitcoindArgs {
type Item = String; type Item = String;
type IntoIter = ::std::vec::IntoIter<String>; type IntoIter = ::std::vec::IntoIter<String>;
// todo: these "defaults" are only suitable for our tests and need to be looked
// at
fn into_iter(self) -> <Self as IntoIterator>::IntoIter { fn into_iter(self) -> <Self as IntoIterator>::IntoIter {
let args = vec![ let args = vec![
"-server".to_string(), "-server".to_string(),

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);