Skip to content

Commit

Permalink
chore: upgrade sn-releases to new minor version
Browse files Browse the repository at this point in the history
The new version of `sn-releases` uses a `Version` type rather than strings, and also renamed a
trait, so the code had to be updated accordingly.
  • Loading branch information
jacderida committed Mar 19, 2024
1 parent 480958f commit 0c67b54
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 66 deletions.
94 changes: 48 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sn_node_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ service-manager = "0.6.0"
sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.2.8" }
sn_protocol = { path = "../sn_protocol", version = "0.15.4" }
sn_service_management = { path = "../sn_service_management", version = "0.1.1" }
sn-releases = { git = "https://github.com/jacderida/sn-releases", branch = "add-daemon-release" }
sn-releases = "0.2.0"
sn_transfers = { path = "../sn_transfers", version = "0.16.4" }
sysinfo = "0.29.10"
tokio = { version = "1.26", features = ["full"] }
Expand Down
4 changes: 2 additions & 2 deletions sn_node_manager/src/cmd/daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::{
ServiceManager, VerbosityLevel,
};
use color_eyre::{eyre::eyre, Result};
use sn_releases::{ReleaseType, SafeReleaseRepositoryInterface};
use sn_releases::{ReleaseType, SafeReleaseRepoActions};
use sn_service_management::{
control::{ServiceControl, ServiceController},
DaemonService, NodeRegistry,
Expand Down Expand Up @@ -45,7 +45,7 @@ pub async fn add(
service_manager.create_service_user(service_user)?;

let mut node_registry = NodeRegistry::load(&config::get_node_registry_path()?)?;
let release_repo = <dyn SafeReleaseRepositoryInterface>::default_config();
let release_repo = <dyn SafeReleaseRepoActions>::default_config();

let (daemon_src_bin_path, version) = if let Some(path) = src_path {
let version = get_bin_version(&path)?;
Expand Down
4 changes: 2 additions & 2 deletions sn_node_manager/src/cmd/faucet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use color_eyre::{eyre::eyre, Result};
use colored::Colorize;
use semver::Version;
use sn_peers_acquisition::{get_peers_from_args, PeersArgs};
use sn_releases::{ReleaseType, SafeReleaseRepositoryInterface};
use sn_releases::{ReleaseType, SafeReleaseRepoActions};
use sn_service_management::{
control::{ServiceControl, ServiceController},
FaucetService, NodeRegistry, UpgradeOptions,
Expand Down Expand Up @@ -52,7 +52,7 @@ pub async fn add(
config::get_service_log_dir_path(ReleaseType::Faucet, log_dir_path, service_user)?;

let mut node_registry = NodeRegistry::load(&config::get_node_registry_path()?)?;
let release_repo = <dyn SafeReleaseRepositoryInterface>::default_config();
let release_repo = <dyn SafeReleaseRepoActions>::default_config();

let (faucet_src_bin_path, version) = if let Some(path) = src_path {
let version = get_bin_version(&path)?;
Expand Down
Loading

0 comments on commit 0c67b54

Please sign in to comment.