node: Remove `radicle_fetch::Config` from `worker::Config`
The configuration options are now passed through to the worker, and are no longer needed to initialise.
This commit is contained in:
parent
07f3d56559
commit
ef4ddf06c3
|
|
@ -235,10 +235,6 @@ impl Runtime {
|
||||||
|
|
||||||
let nid = *signer.public_key();
|
let nid = *signer.public_key();
|
||||||
let fetch = worker::FetchConfig {
|
let fetch = worker::FetchConfig {
|
||||||
config: radicle_fetch::Config {
|
|
||||||
limit: radicle_fetch::FetchLimit::default(),
|
|
||||||
level_min: config.fetch.feature_level_min(),
|
|
||||||
},
|
|
||||||
local: nid,
|
local: nid,
|
||||||
expiry: worker::garbage::Expiry::default(),
|
expiry: worker::garbage::Expiry::default(),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,6 @@ pub struct TaskResult {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct FetchConfig {
|
pub struct FetchConfig {
|
||||||
/// Configuration passed to the fetch protocol.
|
|
||||||
pub config: radicle_fetch::Config,
|
|
||||||
/// Public key of the local peer.
|
/// Public key of the local peer.
|
||||||
pub local: crypto::PublicKey,
|
pub local: crypto::PublicKey,
|
||||||
/// Configuration for `git gc` garbage collection. Defaults to `1
|
/// Configuration for `git gc` garbage collection. Defaults to `1
|
||||||
|
|
@ -243,11 +241,7 @@ impl Worker {
|
||||||
channels: channels::ChannelsFlush,
|
channels: channels::ChannelsFlush,
|
||||||
notifs: notifications::StoreWriter,
|
notifs: notifications::StoreWriter,
|
||||||
) -> Result<fetch::FetchResult, FetchError> {
|
) -> Result<fetch::FetchResult, FetchError> {
|
||||||
let FetchConfig {
|
let FetchConfig { local, expiry } = &self.fetch_config;
|
||||||
config: _,
|
|
||||||
local,
|
|
||||||
expiry,
|
|
||||||
} = &self.fetch_config;
|
|
||||||
// N.b. if the `rid` is blocked this will return an error, so
|
// N.b. if the `rid` is blocked this will return an error, so
|
||||||
// we won't continue with any further set up of the fetch.
|
// we won't continue with any further set up of the fetch.
|
||||||
let allowed = radicle_fetch::Allowed::from_config(rid, &self.policies)?;
|
let allowed = radicle_fetch::Allowed::from_config(rid, &self.policies)?;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue