Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-25 07:29:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename storage.rs to database.rs to reduce terminology variants

Browse Source
This commit is contained in:
Franck Royer 2020-12-23 15:17:27 +11:00
parent 5ed18469e4
commit 8c7964bfee
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swap/src/alice/swap.rs
View File

@ -11,9 +11,9 @@ use crate::{
}, },
}, },
bitcoin::EncryptedSignature, bitcoin::EncryptedSignature,
database::Database,
network::request_response::AliceToBob, network::request_response::AliceToBob,
state::Swap, state::Swap,
storage::Database,
SwapAmounts, SwapAmounts,
}; };
use anyhow::Result; use anyhow::Result;

2
swap/src/bob/swap.rs
View File

@ -1,4 +1,4 @@
use crate::{bob::event_loop::EventLoopHandle, state, storage::Database, SwapAmounts}; use crate::{bob::event_loop::EventLoopHandle, database::Database, state, SwapAmounts};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use async_recursion::async_recursion; use async_recursion::async_recursion;
use rand::{CryptoRng, RngCore}; use rand::{CryptoRng, RngCore};

0
swap/src/storage.rs → swap/src/database.rs
View File

2
swap/src/lib.rs
View File

@ -20,10 +20,10 @@ pub mod alice;
pub mod bitcoin; pub mod bitcoin;
pub mod bob; pub mod bob;
pub mod cli; pub mod cli;
pub mod database;
pub mod monero; pub mod monero;
pub mod network; pub mod network;
pub mod state; pub mod state;
pub mod storage;
pub mod trace; pub mod trace;
pub type Never = std::convert::Infallible; pub type Never = std::convert::Infallible;

2
swap/src/main.rs
View File

@ -25,10 +25,10 @@ use swap::{
bitcoin, bob, bitcoin, bob,
bob::swap::BobState, bob::swap::BobState,
cli::{Command, Options, Resume}, cli::{Command, Options, Resume},
database::Database,
monero, monero,
network::transport::build, network::transport::build,
state::Swap, state::Swap,
storage::Database,
trace::init_tracing, trace::init_tracing,
SwapAmounts, SwapAmounts,
}; };

2
swap/tests/happy_path_restart_alice.rs
View File

@ -2,7 +2,7 @@ use crate::testutils::{init_alice, init_bob};
use get_port::get_port; use get_port::get_port;
use libp2p::Multiaddr; use libp2p::Multiaddr;
use rand::rngs::OsRng; use rand::rngs::OsRng;
use swap::{alice, alice::swap::AliceState, bitcoin, bob, storage::Database}; use swap::{alice, alice::swap::AliceState, bitcoin, bob, database::Database};
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::clients::Cli; use testcontainers::clients::Cli;
use testutils::init_tracing; use testutils::init_tracing;

2
swap/tests/happy_path_restart_bob_after_comm.rs
View File

@ -2,7 +2,7 @@ use crate::testutils::{init_alice, init_bob};
use get_port::get_port; use get_port::get_port;
use libp2p::Multiaddr; use libp2p::Multiaddr;
use rand::rngs::OsRng; use rand::rngs::OsRng;
use swap::{alice, bitcoin, bob, bob::swap::BobState, storage::Database}; use swap::{alice, bitcoin, bob, bob::swap::BobState, database::Database};
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::clients::Cli; use testcontainers::clients::Cli;
use testutils::init_tracing; use testutils::init_tracing;

2
swap/tests/happy_path_restart_bob_before_comm.rs
View File

@ -2,7 +2,7 @@ use crate::testutils::{init_alice, init_bob};
use get_port::get_port; use get_port::get_port;
use libp2p::Multiaddr; use libp2p::Multiaddr;
use rand::rngs::OsRng; use rand::rngs::OsRng;
use swap::{alice, alice::swap::AliceState, bitcoin, bob, bob::swap::BobState, storage::Database}; use swap::{alice, alice::swap::AliceState, bitcoin, bob, bob::swap::BobState, database::Database};
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::clients::Cli; use testcontainers::clients::Cli;
use testutils::init_tracing; use testutils::init_tracing;

2
swap/tests/refund_restart_alice.rs
View File

@ -3,7 +3,7 @@ use futures::future::try_join;
use get_port::get_port; use get_port::get_port;
use libp2p::Multiaddr; use libp2p::Multiaddr;
use rand::rngs::OsRng; use rand::rngs::OsRng;
use swap::{alice, alice::swap::AliceState, bob, bob::swap::BobState, storage::Database}; use swap::{alice, alice::swap::AliceState, bob, bob::swap::BobState, database::Database};
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::clients::Cli; use testcontainers::clients::Cli;
use testutils::init_tracing; use testutils::init_tracing;

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

@ -4,8 +4,8 @@ use monero_harness::{image, Monero};
use rand::rngs::OsRng; use rand::rngs::OsRng;
use std::sync::Arc; use std::sync::Arc;
use swap::{ use swap::{
alice, alice::swap::AliceState, bitcoin, bob, bob::swap::BobState, monero, alice, alice::swap::AliceState, bitcoin, bob, bob::swap::BobState, database::Database, monero,
network::transport::build, storage::Database, SwapAmounts, network::transport::build, SwapAmounts,
}; };
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::{clients::Cli, Container}; use testcontainers::{clients::Cli, Container};