From cb32df9a193a1ab99187cefee925ba20e502db49 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Wed, 19 Aug 2020 13:32:54 +0300
Subject: [PATCH] Remove errors from log (#294)

* changed log level from error to trace

* incomplete during submit != synced
---
 bridges/bin/node/runtime/src/exchange.rs |  6 +++---
 bridges/relays/ethereum/src/headers.rs   | 23 ++++++++++++++---------
 bridges/relays/ethereum/src/sync_loop.rs |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bridges/bin/node/runtime/src/exchange.rs b/bridges/bin/node/runtime/src/exchange.rs
index 0812006ebd66a..7296fc41e1c2e 100644
--- a/bridges/bin/node/runtime/src/exchange.rs
+++ b/bridges/bin/node/runtime/src/exchange.rs
@@ -81,7 +81,7 @@ impl MaybeLockFundsTransaction for EthTransaction {
 
 		// we only accept transactions sending funds directly to the pre-configured address
 		if tx.unsigned.to != Some(LOCK_FUNDS_ADDRESS.into()) {
-			frame_support::debug::error!(
+			frame_support::debug::trace!(
 				target: "runtime",
 				"Failed to parse fund locks transaction. Invalid peer recipient: {:?}",
 				tx.unsigned.to,
@@ -94,7 +94,7 @@ impl MaybeLockFundsTransaction for EthTransaction {
 		match tx.unsigned.payload.len() {
 			32 => recipient_raw.as_fixed_bytes_mut().copy_from_slice(&tx.unsigned.payload),
 			len => {
-				frame_support::debug::error!(
+				frame_support::debug::trace!(
 					target: "runtime",
 					"Failed to parse fund locks transaction. Invalid recipient length: {}",
 					len,
@@ -106,7 +106,7 @@ impl MaybeLockFundsTransaction for EthTransaction {
 		let amount = tx.unsigned.value.low_u128();
 
 		if tx.unsigned.value != amount.into() {
-			frame_support::debug::error!(
+			frame_support::debug::trace!(
 				target: "runtime",
 				"Failed to parse fund locks transaction. Invalid amount: {}",
 				tx.unsigned.value,
diff --git a/bridges/relays/ethereum/src/headers.rs b/bridges/relays/ethereum/src/headers.rs
index 8980bcccf3e8a..63c8e07351f8a 100644
--- a/bridges/relays/ethereum/src/headers.rs
+++ b/bridges/relays/ethereum/src/headers.rs
@@ -404,9 +404,12 @@ impl<P: HeadersSyncPipeline> QueuedHeaders<P> {
 	}
 
 	/// Marks given headers incomplete.
-	pub fn add_incomplete_headers(&mut self, new_incomplete_headers: Vec<HeaderIdOf<P>>) {
+	pub fn add_incomplete_headers(&mut self, make_header_incomplete: bool, new_incomplete_headers: Vec<HeaderIdOf<P>>) {
 		for new_incomplete_header in new_incomplete_headers {
-			self.header_synced(&new_incomplete_header);
+			if make_header_incomplete {
+				self.header_synced(&new_incomplete_header);
+			}
+
 			move_header_descendants::<P>(
 				&mut [&mut self.ready, &mut self.submitted],
 				&mut self.incomplete,
@@ -415,13 +418,15 @@ impl<P: HeadersSyncPipeline> QueuedHeaders<P> {
 				&new_incomplete_header,
 			);
 
-			log::debug!(
-				target: "bridge",
-				"Scheduling completion data retrieval for header: {:?}",
-				new_incomplete_header,
-			);
+			if make_header_incomplete {
+				log::debug!(
+					target: "bridge",
+					"Scheduling completion data retrieval for header: {:?}",
+					new_incomplete_header,
+				);
 
-			self.incomplete_headers.insert(new_incomplete_header, None);
+				self.incomplete_headers.insert(new_incomplete_header, None);
+			}
 		}
 	}
 
@@ -434,7 +439,7 @@ impl<P: HeadersSyncPipeline> QueuedHeaders<P> {
 			.filter(|id| !self.incomplete_headers.contains_key(id) && !self.completion_data.contains_key(id))
 			.cloned()
 			.collect::<Vec<_>>();
-		self.add_incomplete_headers(new_incomplete_headers);
+		self.add_incomplete_headers(true, new_incomplete_headers);
 
 		// for all headers that were incompleted previously, but now are completed, we move
 		// all descendants from incomplete to ready
diff --git a/bridges/relays/ethereum/src/sync_loop.rs b/bridges/relays/ethereum/src/sync_loop.rs
index 12fdf0d01b5bf..4b82bfdf12113 100644
--- a/bridges/relays/ethereum/src/sync_loop.rs
+++ b/bridges/relays/ethereum/src/sync_loop.rs
@@ -334,7 +334,7 @@ pub fn run<P: HeadersSyncPipeline, TC: TargetClient<P>>(
 					log::debug!(target: "bridge", "Header submit result: {}", submitted_headers_str);
 
 					sync.headers_mut().headers_submitted(submitted_headers.submitted);
-					sync.headers_mut().add_incomplete_headers(submitted_headers.incomplete);
+					sync.headers_mut().add_incomplete_headers(false, submitted_headers.incomplete);
 
 					// when there's no fatal error, but node has rejected all our headers we may
 					// want to pause until our submitted headers will be accepted