From d53835bdd0cff3c5db89a51967b866035def5a18 Mon Sep 17 00:00:00 2001 From: librelois Date: Tue, 8 Nov 2022 16:56:05 +0100 Subject: [PATCH 1/3] perf: generate_initial_session_keys: load runtime only if its relevant --- primitives/session/src/lib.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs index 1b25d285e3bca..b9fcca8369c29 100644 --- a/primitives/session/src/lib.rs +++ b/primitives/session/src/lib.rs @@ -118,10 +118,12 @@ where T: ProvideRuntimeApi, T::Api: SessionKeys, { - let runtime_api = client.runtime_api(); + if !seeds.is_empty() { + let runtime_api = client.runtime_api(); - for seed in seeds { - runtime_api.generate_session_keys(at, Some(seed.as_bytes().to_vec()))?; + for seed in seeds { + runtime_api.generate_session_keys(at, Some(seed.as_bytes().to_vec()))?; + } } Ok(()) From 84ec23a208ea74c68644a2c7bf599db7725f5bae Mon Sep 17 00:00:00 2001 From: librelois Date: Tue, 8 Nov 2022 19:29:41 +0100 Subject: [PATCH 2/3] apply review suggestion --- primitives/session/src/lib.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs index b9fcca8369c29..49975e219276e 100644 --- a/primitives/session/src/lib.rs +++ b/primitives/session/src/lib.rs @@ -119,11 +119,13 @@ where T::Api: SessionKeys, { if !seeds.is_empty() { - let runtime_api = client.runtime_api(); + return Ok(()) + } + + let runtime_api = client.runtime_api(); - for seed in seeds { - runtime_api.generate_session_keys(at, Some(seed.as_bytes().to_vec()))?; - } + for seed in seeds { + runtime_api.generate_session_keys(at, Some(seed.as_bytes().to_vec()))?; } Ok(()) From 3dce0338a1614d2f8b0d40c692332294e98b4f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lo=C3=AFs?= Date: Mon, 21 Nov 2022 15:31:38 +0100 Subject: [PATCH 3/3] Update primitives/session/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- primitives/session/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/session/src/lib.rs b/primitives/session/src/lib.rs index 49975e219276e..dde262738ad71 100644 --- a/primitives/session/src/lib.rs +++ b/primitives/session/src/lib.rs @@ -118,7 +118,7 @@ where T: ProvideRuntimeApi, T::Api: SessionKeys, { - if !seeds.is_empty() { + if seeds.is_empty() { return Ok(()) }