fix compile with new compiler - dead code (paritytech#4530)

* make compiler happy

* node side compile warning quiet

* ffs

* malus: remove unused keystore

node/core/dispute-coordinator/src/metrics.rs

@@ -19,12 +19,16 @@ use polkadot_node_subsystem_util::metrics::{self, prometheus};
 #[derive(Clone)]
 struct MetricsInner {
  /// Number of opened disputes.
+ #[cfg(feature = "disputes")]
  open: prometheus::Counter<prometheus::U64>,
  /// Votes of all disputes.
+ #[cfg(feature = "disputes")]
  votes: prometheus::CounterVec<prometheus::U64>,
  /// Conclusion across all disputes.
+ #[cfg(feature = "disputes")]
  concluded: prometheus::CounterVec<prometheus::U64>,
  /// Number of participations that have been queued.
+ #[cfg(feature = "disputes")]
  queued_participations: prometheus::CounterVec<prometheus::U64>,
 }
 
@@ -78,6 +82,13 @@ impl Metrics {
 }
 
 impl metrics::Metrics for Metrics {
+ #[cfg(not(feature = "disputes"))]
+ fn try_register(_registry: &prometheus::Registry) -> Result<Self, prometheus::PrometheusError> {
+ let metrics = MetricsInner {};
+ Ok(Metrics(Some(metrics)))
+ }
+
+ #[cfg(feature = "disputes")]
  fn try_register(registry: &prometheus::Registry) -> Result<Self, prometheus::PrometheusError> {
  let metrics = MetricsInner {
  open: prometheus::register(

node/malus/src/variants/suggest_garbage_candidate.rs

@@ -60,7 +60,6 @@ struct ReplacePoVBytes<Sender>
 where
  Sender: Send,
 {
- keystore: SyncCryptoStorePtr,
  queue: metered::UnboundedMeteredSender<(Sender, Hash, CandidateReceipt)>,
 }
 
@@ -112,7 +111,7 @@ impl OverseerGen for SuggestGarbageCandidate {
  let (sink, source) = metered::unbounded();
  let keystore = args.keystore.clone() as SyncCryptoStorePtr;
 
- let filter = ReplacePoVBytes { keystore: keystore.clone(), queue: sink };
+ let filter = ReplacePoVBytes { queue: sink };
 
  let keystore2 = keystore.clone();
  let spawner2 = spawner.clone();

utils/staking-miner/src/main.rs

@@ -319,10 +319,12 @@ struct MonitorConfig {
 #[derive(Debug, Clone, StructOpt)]
 struct EmergencySolutionConfig {
  /// The block hash at which scraping happens. If none is provided, the latest head is used.
+ #[allow(dead_code)]
  #[structopt(long)]
  at: Option<Hash>,
 
  /// The solver algorithm to use.
+ #[allow(dead_code)]
  #[structopt(subcommand)]
  solver: Solvers,