nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move structs next to their methods

Browse Source
This commit is contained in:
edouard 2023-08-30 18:50:22 +02:00
parent c756969e72
commit d4cf9e3466
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gui/src/installer/step/bitcoind.rs
View File

@ -133,30 +133,6 @@ fn download_url() -> String {
)
}
pub struct DefineBitcoind {
cookie_path: form::Value<String>,
address: form::Value<String>,
is_running: Option<Result<(), Error>>,
}
pub struct InternalBitcoindStep {
liana_datadir: PathBuf,
bitcoind_datadir: PathBuf,
network: Network,
started: Option<Result<(), StartInternalBitcoindError>>,
exe_path: Option<PathBuf>,
bitcoind_config: Option<BitcoindConfig>,
exe_config: Option<InternalBitcoindExeConfig>,
internal_bitcoind_config: Option<InternalBitcoindConfig>,
error: Option<String>,
exe_download: Option<Download>,
install_state: Option<InstallState>,
}
pub struct SelectBitcoindTypeStep {
use_external: bool,
}
/// Default prune value used by internal bitcoind.
pub const PRUNE_DEFAULT: u32 = 15_000;
/// Default ports used by bitcoind across all networks.
@ -511,6 +487,10 @@ pub fn port_is_valid(port: &u16) -> bool {
!BITCOIND_DEFAULT_PORTS.contains(port)
}
pub struct SelectBitcoindTypeStep {
use_external: bool,
}
impl Default for SelectBitcoindTypeStep {
fn default() -> Self {
Self::new()
@ -560,6 +540,12 @@ impl Step for SelectBitcoindTypeStep {
}
}
pub struct DefineBitcoind {
cookie_path: form::Value<String>,
address: form::Value<String>,
is_running: Option<Result<(), Error>>,
}
impl DefineBitcoind {
pub fn new() -> Self {
Self {
@ -682,6 +668,20 @@ impl From<DefineBitcoind> for Box<dyn Step> {
}
}
pub struct InternalBitcoindStep {
liana_datadir: PathBuf,
bitcoind_datadir: PathBuf,
network: Network,
started: Option<Result<(), StartInternalBitcoindError>>,
exe_path: Option<PathBuf>,
bitcoind_config: Option<BitcoindConfig>,
exe_config: Option<InternalBitcoindExeConfig>,
internal_bitcoind_config: Option<InternalBitcoindConfig>,
error: Option<String>,
exe_download: Option<Download>,
install_state: Option<InstallState>,
}
impl From<InternalBitcoindStep> for Box<dyn Step> {
fn from(s: InternalBitcoindStep) -> Box<dyn Step> {
Box::new(s)