From f0c412678b44444ec36098c6ca79a858cfb108e1 Mon Sep 17 00:00:00 2001
From: Nikolai Golub <nikolai@sovlabs.io>
Date: Thu, 10 Aug 2023 16:43:48 +0200
Subject: [PATCH] Fix after rebase

---
 Cargo.lock                                    | 11 ++++++++++
 .../src/chain_state/helpers.rs                | 17 ++++++++++++++
 .../tests/capability_tests.rs                 | 22 +++++--------------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b912707df..01ace56fff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1335,6 +1335,7 @@ dependencies = [
  "serde_json",
  "sov-accounts",
  "sov-bank",
+ "sov-blob-storage",
  "sov-data-generators",
  "sov-election",
  "sov-evm",
@@ -6244,11 +6245,21 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
+ "borsh",
+ "clap",
+ "hex",
+ "jsonrpsee 0.18.2",
+ "schemars",
+ "serde",
+ "serde_json",
+ "sov-bank",
  "sov-modules-api",
  "sov-modules-macros",
  "sov-rollup-interface",
+ "sov-sequencer-registry",
  "sov-state",
  "tempfile",
+ "tracing",
 ]
 
 [[package]]
diff --git a/module-system/module-implementations/integration-tests/src/chain_state/helpers.rs b/module-system/module-implementations/integration-tests/src/chain_state/helpers.rs
index 35c260fa66..3eaf4b4f69 100644
--- a/module-system/module-implementations/integration-tests/src/chain_state/helpers.rs
+++ b/module-system/module-implementations/integration-tests/src/chain_state/helpers.rs
@@ -1,4 +1,5 @@
 use sov_chain_state::{ChainState, ChainStateConfig};
+use sov_modules_api::capabilities::{BlobRefOrOwned, BlobSelector};
 use sov_modules_api::default_context::DefaultContext;
 use sov_modules_api::hooks::{ApplyBlobHooks, SlotHooks, TxHooks};
 use sov_modules_api::transaction::Transaction;
@@ -73,6 +74,22 @@ impl<C: Context, Cond: ValidityCondition> SlotHooks<Cond> for TestRuntime<C, Con
     fn end_slot_hook(&self, _working_set: &mut WorkingSet<<Self::Context as Spec>::Storage>) {}
 }
 
+impl<C: Context, Cond: ValidityCondition> BlobSelector for TestRuntime<C, Cond> {
+    type Context = C;
+
+    fn get_blobs_for_this_slot<'a, I, B>(
+        &self,
+        current_blobs: I,
+        _working_set: &mut WorkingSet<<Self::Context as Spec>::Storage>,
+    ) -> anyhow::Result<Vec<BlobRefOrOwned<'a, B>>>
+    where
+        B: BlobReaderTrait,
+        I: IntoIterator<Item = &'a mut B>,
+    {
+        Ok(current_blobs.into_iter().map(Into::into).collect())
+    }
+}
+
 impl<C: Context, Cond: ValidityCondition> Runtime<C, Cond> for TestRuntime<C, Cond> {}
 
 pub(crate) fn create_demo_genesis_config<C: Context, Cond: ValidityCondition>(
diff --git a/module-system/module-implementations/sov-blob-storage/tests/capability_tests.rs b/module-system/module-implementations/sov-blob-storage/tests/capability_tests.rs
index ec24590bb2..6a2f29760a 100644
--- a/module-system/module-implementations/sov-blob-storage/tests/capability_tests.rs
+++ b/module-system/module-implementations/sov-blob-storage/tests/capability_tests.rs
@@ -52,10 +52,7 @@ fn priority_sequencer_flow() {
     let regular_sequencer_da = MockAddress::from([30u8; 32]);
     let regular_sequencer_rollup = generate_address(REGULAR_SEQUENCER_KEY);
 
-    let bank_config = get_bank_config(
-        preferred_sequencer_rollup.clone(),
-        regular_sequencer_rollup.clone(),
-    );
+    let bank_config = get_bank_config(preferred_sequencer_rollup, regular_sequencer_rollup);
 
     let token_address = sov_bank::get_genesis_token_address::<C>(
         &bank_config.tokens[0].token_name,
@@ -155,10 +152,7 @@ fn test_blobs_from_non_registered_sequencers_are_not_saved() {
     let regular_sequencer_rollup = generate_address(REGULAR_SEQUENCER_KEY);
     let some_sequencer = MockAddress::from([40u8; 32]);
 
-    let bank_config = get_bank_config(
-        preferred_sequencer_rollup.clone(),
-        regular_sequencer_rollup.clone(),
-    );
+    let bank_config = get_bank_config(preferred_sequencer_rollup, regular_sequencer_rollup);
 
     let token_address = sov_bank::get_genesis_token_address::<C>(
         &bank_config.tokens[0].token_name,
@@ -226,10 +220,7 @@ fn test_blobs_no_deferred_without_preferred_sequencer() {
     let regular_sequencer_da = MockAddress::from([30u8; 32]);
     let regular_sequencer_rollup = generate_address(REGULAR_SEQUENCER_KEY);
 
-    let bank_config = get_bank_config(
-        preferred_sequencer_rollup.clone(),
-        regular_sequencer_rollup.clone(),
-    );
+    let bank_config = get_bank_config(preferred_sequencer_rollup, regular_sequencer_rollup);
 
     let token_address = sov_bank::get_genesis_token_address::<C>(
         &bank_config.tokens[0].token_name,
@@ -298,10 +289,7 @@ fn deferred_blobs_are_first_after_preferred_sequencer_exit() {
     let regular_sequencer_da = MockAddress::from([30u8; 32]);
     let regular_sequencer_rollup = generate_address(REGULAR_SEQUENCER_KEY);
 
-    let bank_config = get_bank_config(
-        preferred_sequencer_rollup.clone(),
-        regular_sequencer_rollup.clone(),
-    );
+    let bank_config = get_bank_config(preferred_sequencer_rollup, regular_sequencer_rollup);
 
     let token_address = sov_bank::get_genesis_token_address::<C>(
         &bank_config.tokens[0].token_name,
@@ -309,7 +297,7 @@ fn deferred_blobs_are_first_after_preferred_sequencer_exit() {
     );
 
     let sequencer_registry_config = SequencerConfig {
-        seq_rollup_address: preferred_sequencer_rollup.clone(),
+        seq_rollup_address: preferred_sequencer_rollup,
         seq_da_address: preferred_sequencer_da.as_ref().to_vec(),
         coins_to_lock: sov_bank::Coins {
             amount: LOCKED_AMOUNT,