From 6b21c97dd95bff61690be97cd6c5179c10caf9e9 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Fri, 8 Dec 2023 22:26:09 +0100
Subject: [PATCH] feat(#157): add logs for oracle
---
client/distance/src/lib.rs | 15 +++++++++++++--
distance-oracle/src/api.rs | 16 +++++++++++++---
distance-oracle/src/lib.rs | 23 +++++++++++++++++------
3 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/client/distance/src/lib.rs b/client/distance/src/lib.rs
index 821be0c6d..f2b29cbe9 100644
--- a/client/distance/src/lib.rs
+++ b/client/distance/src/lib.rs
@@ -43,6 +43,7 @@ where
IdtyIndex: Decode + Encode + PartialEq + TypeInfo,
{
let &[owner_key] = owner_keys else {
+ log::error!("🧙 [distance oracle] More than one Babe owner key: oracle cannot work");
return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(None));
};
let owner_key = sp_runtime::AccountId32::new(owner_key.0);
@@ -82,23 +83,33 @@ where
// Have we already published a result for this session?
if published_results.evaluators.contains(&owner_key) {
+ log::debug!("🧙 [distance oracle] Already published a result for this session");
return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(None));
}
// Read evaluation result from file, if it exists
+ log::debug!(
+ "🧙 [distance oracle] Reading evaluation result from file {:?}",
+ distance_dir.clone().join(session_index.to_string())
+ );
let evaluation_result = match std::fs::read(distance_dir.join(session_index.to_string())) {
Ok(data) => data,
Err(e) => {
match e.kind() {
- std::io::ErrorKind::NotFound => {}
+ std::io::ErrorKind::NotFound => {
+ log::debug!("🧙 [distance oracle] Evaluation result file not found");
+ }
_ => {
- log::error!("Cannot read distance evaluation result file: {e:?}");
+ log::error!(
+ "🧙 [distance oracle] Cannot read distance evaluation result file: {e:?}"
+ );
}
}
return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(None));
}
};
+ log::info!("🧙 [distance oracle] Providing evaluation result");
Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(Some(
sp_distance::ComputationResult::decode(&mut evaluation_result.as_slice()).unwrap(),
)))
diff --git a/distance-oracle/src/api.rs b/distance-oracle/src/api.rs
index 8a7699811..0ddcaba1d 100644
--- a/distance-oracle/src/api.rs
+++ b/distance-oracle/src/api.rs
@@ -15,6 +15,7 @@
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
use crate::runtime;
+use log::debug;
use sp_core::H256;
use subxt::storage::StorageKey;
@@ -52,9 +53,18 @@ pub async fn current_pool(
.storage()
.at(parent_hash)
.fetch(&match current_session % 3 {
- 0 => runtime::storage().distance().evaluation_pool1(),
- 1 => runtime::storage().distance().evaluation_pool2(),
- 2 => runtime::storage().distance().evaluation_pool0(),
+ 0 => {
+ debug!("Looking at Pool1 for session {}", current_session);
+ runtime::storage().distance().evaluation_pool1()
+ }
+ 1 => {
+ debug!("Looking at Pool2 for session {}", current_session);
+ runtime::storage().distance().evaluation_pool2()
+ }
+ 2 => {
+ debug!("Looking at Pool0 for session {}", current_session);
+ runtime::storage().distance().evaluation_pool0()
+ }
_ => unreachable!("n%3<3"),
})
.await
diff --git a/distance-oracle/src/lib.rs b/distance-oracle/src/lib.rs
index 738e43bbc..bc8c432ba 100644
--- a/distance-oracle/src/lib.rs
+++ b/distance-oracle/src/lib.rs
@@ -28,7 +28,7 @@ use api::{AccountId, IdtyIndex};
use codec::Encode;
use fnv::{FnvHashMap, FnvHashSet};
-use log::{debug, error, warn};
+use log::{debug, error, info, warn};
use rayon::iter::IntoParallelRefIterator;
use rayon::iter::ParallelIterator;
use std::io::Write;
@@ -93,6 +93,7 @@ pub async fn run_and_save(client: &api::Client, settings: Settings) {
return;
};
+ debug!("Saving distance evaluation result to file `{evaluation_result_path:?}`");
let mut evaluation_result_file = std::fs::OpenOptions::new()
.write(true)
.create_new(true)
@@ -155,13 +156,13 @@ pub async fn run(
// Fetch the pending identities
let Some(evaluation_pool) = api::current_pool(client, parent_hash, current_session).await
else {
- debug!("Nothing to do: Pool does not exist");
+ info!("Nothing to do: Pool does not exist");
return None;
};
// Stop if nothing to evaluate
if evaluation_pool.evaluations.0.is_empty() {
- debug!("Nothing to do: Pool is empty");
+ info!("Nothing to do: Pool is empty");
return None;
}
@@ -172,7 +173,7 @@ pub async fn run(
if handle_fs {
// Stop if already evaluated
if evaluation_result_path.try_exists().unwrap() {
- debug!("Nothing to do: File already exists");
+ info!("Nothing to do: File already exists");
return None;
}
@@ -184,6 +185,7 @@ pub async fn run(
});
}
+ info!("Evaluating distance for session {}", current_session);
let evaluation_block = api::evaluation_block(client, parent_hash).await;
// member idty -> issued certs
@@ -292,6 +294,7 @@ fn distance_rule(
depth: u32,
idty: IdtyIndex,
) -> sp_runtime::Perbill {
+ debug!("Evaluating distance for idty {}", idty);
let mut accessible_referees =
FnvHashSet::<IdtyIndex>::with_capacity_and_hasher(referees.len(), Default::default());
let mut known_idties =
@@ -304,12 +307,20 @@ fn distance_rule(
&mut known_idties,
depth,
);
- if referees.contains_key(&idty) {
+ let result = if referees.contains_key(&idty) {
sp_runtime::Perbill::from_rational(
accessible_referees.len() as u32 - 1,
referees.len() as u32 - 1,
)
} else {
sp_runtime::Perbill::from_rational(accessible_referees.len() as u32, referees.len() as u32)
- }
+ };
+ info!(
+ "Distance for idty {}: {}/{} = {}%",
+ idty,
+ accessible_referees.len(),
+ referees.len(),
+ result.deconstruct() as f32 / 1_000_000_000f32 * 100f32
+ );
+ result
}
--
GitLab