From fe6d99c5b1976bc9df62a0353bd3bba9f9a8c9d9 Mon Sep 17 00:00:00 2001 From: silverpill Date: Tue, 24 Jan 2023 21:11:07 +0000 Subject: [PATCH] Drop support for "blockchain" setting --- CHANGELOG.md | 4 ++++ src/config/main.rs | 6 +++--- src/main.rs | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a607cd..0956e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Removed + +- Dropped support for `blockchain` configuration parameter. + ## [1.11.0] - 2023-01-23 ### Added diff --git a/src/config/main.rs b/src/config/main.rs index bd5cb9a..1124662 100644 --- a/src/config/main.rs +++ b/src/config/main.rs @@ -106,7 +106,7 @@ pub struct Config { // Blockchain integrations #[serde(rename = "blockchain")] - pub _blockchain: Option, // deprecated + _blockchain: Option, // deprecated #[serde(default)] blockchains: Vec, @@ -146,8 +146,8 @@ impl Config { } pub fn blockchain(&self) -> Option<&BlockchainConfig> { - if let Some(ref blockchain_config) = self._blockchain { - Some(blockchain_config) + if let Some(ref _blockchain_config) = self._blockchain { + panic!("'blockchain' setting is not supported anymore, use 'blockchains' instead"); } else { match &self.blockchains[..] { [blockchain_config] => Some(blockchain_config), diff --git a/src/main.rs b/src/main.rs index b4649ca..5c3d97e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -57,9 +57,6 @@ async fn main() -> std::io::Result<()> { config.environment, ); - if config._blockchain.is_some() { - log::warn!("'blockchain' property is deprecated, use 'blockchains' instead"); - }; let maybe_blockchain = if let Some(blockchain_config) = config.blockchain() { if let Some(ethereum_config) = blockchain_config.ethereum_config() { // Create blockchain interface