octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zebrad: apply serde(default) to config sections 

Each subsection has to have `serde(default)` to get the behaviour we want
(delete all fields except the ones that have been changed); otherwise, we can
delete only entire sections.
This commit is contained in:
Henry de Valence 2020-06-18 13:34:05 -07:00 committed by Deirdre Connolly
parent 4b8f07ebb2
commit 6cc1627a5d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra-network/src/config.rs
View File

@ -9,7 +9,7 @@ use zebra_chain::Network;
/// Configuration for networking code.
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
#[serde(deny_unknown_fields, default)]
pub struct Config {
/// The address on which this node should listen for connections.
pub listen_addr: SocketAddr,

7
zebrad/src/config.rs
View File

@ -16,8 +16,7 @@ use zebra_network::Config as NetworkSection;
/// of each field is described in the documentation, although it may be necessary
/// to click through to the sub-structures for each section.
#[derive(Clone, Default, Debug, Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
#[serde(default)]
#[serde(deny_unknown_fields, default)]
pub struct ZebradConfig {
/// Tracing configuration
pub tracing: TracingSection,
@ -29,7 +28,7 @@ pub struct ZebradConfig {
/// Tracing configuration section.
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
#[serde(deny_unknown_fields, default)]
pub struct TracingSection {
/// The filter used for tracing events.
pub filter: Option<String>,
@ -45,7 +44,7 @@ impl TracingSection {
/// Metrics configuration section.
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
#[serde(deny_unknown_fields, default)]
pub struct MetricsSection {
pub endpoint_addr: SocketAddr,
}