From eb9025b51e261bb61630e1ee361572045245828e Mon Sep 17 00:00:00 2001
From: Nikolai Golub <nikolai@sovlabs.io>
Date: Mon, 14 Aug 2023 14:20:48 +0200
Subject: [PATCH] Optimize generics declaration

---
 examples/demo-stf/src/runtime.rs                           | 7 +++++--
 module-system/sov-modules-stf-template/src/app_template.rs | 6 ++++--
 module-system/sov-modules-stf-template/src/lib.rs          | 7 +++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs
index 4314942d02..fa156883b3 100644
--- a/examples/demo-stf/src/runtime.rs
+++ b/examples/demo-stf/src/runtime.rs
@@ -107,7 +107,10 @@ impl<C: Context, Cond: ValidityCondition> SlotHooks<Cond> for Runtime<C> {
     }
 }
 
-impl<C: Context, Cond: ValidityCondition, B: BlobReaderTrait>
-    sov_modules_stf_template::Runtime<C, Cond, B> for Runtime<C>
+impl<C, Cond, B> sov_modules_stf_template::Runtime<C, Cond, B> for Runtime<C>
+where
+    C: Context,
+    Cond: ValidityCondition,
+    B: BlobReaderTrait,
 {
 }
diff --git a/module-system/sov-modules-stf-template/src/app_template.rs b/module-system/sov-modules-stf-template/src/app_template.rs
index 91ebe7f630..f11a9be2a9 100644
--- a/module-system/sov-modules-stf-template/src/app_template.rs
+++ b/module-system/sov-modules-stf-template/src/app_template.rs
@@ -69,9 +69,11 @@ impl<A: AddressTrait> From<ApplyBatchError<A>> for BatchReceipt<SequencerOutcome
     }
 }
 
-impl<C: Context, Vm, Cond: ValidityCondition, RT: Runtime<C, Cond, B>, B: BlobReaderTrait>
-    AppTemplate<C, Cond, Vm, RT, B>
+impl<C, Vm, Cond, RT, B> AppTemplate<C, Cond, Vm, RT, B>
 where
+    C: Context,
+    Cond: ValidityCondition,
+    B: BlobReaderTrait,
     RT: Runtime<C, Cond, B>,
 {
     /// [`AppTemplate`] constructor.
diff --git a/module-system/sov-modules-stf-template/src/lib.rs b/module-system/sov-modules-stf-template/src/lib.rs
index 22428209eb..3d685f5065 100644
--- a/module-system/sov-modules-stf-template/src/lib.rs
+++ b/module-system/sov-modules-stf-template/src/lib.rs
@@ -64,9 +64,12 @@ pub enum SlashingReason {
     InvalidTransactionEncoding,
 }
 
-impl<C: Context, RT, Vm: Zkvm, Cond: ValidityCondition, B: BlobReaderTrait>
-    AppTemplate<C, Cond, Vm, RT, B>
+impl<C, RT, Vm, Cond, B> AppTemplate<C, Cond, Vm, RT, B>
 where
+    C: Context,
+    Vm: Zkvm,
+    Cond: ValidityCondition,
+    B: BlobReaderTrait,
     RT: Runtime<C, Cond, B>,
 {
     fn begin_slot(