Prefer sov_modules_api over direct sov_rollup_interface for modules (Sovereign-Labs#1125)

citizen-stig · web-flow · commit 5d61e3567c59 · 2023-10-31T15:05:51.000Z
* Remove extensive usage of `sov-rollup-interface`

* Remove non-needed feature passing
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/demo-rollup/provers/risc0/guest-celestia/Cargo.lock b/examples/demo-rollup/provers/risc0/guest-celestia/Cargo.lock
diff --git a/examples/demo-rollup/provers/risc0/guest-mock/Cargo.lock b/examples/demo-rollup/provers/risc0/guest-mock/Cargo.lock
diff --git a/module-system/module-implementations/examples/sov-vec-setter/Cargo.toml b/module-system/module-implementations/examples/sov-vec-setter/Cargo.toml
@@ -20,7 +20,6 @@ tempfile = { workspace = true }
 anyhow = { workspace = true }
 sov-modules-api = { path = "../../../sov-modules-api", default-features = false, features = ["macros"] }
 sov-state = { path = "../../../sov-state", default-features = false }
-sov-rollup-interface = { path = "../../../../rollup-interface" }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true, optional = true }
diff --git a/module-system/module-implementations/integration-tests/Cargo.toml b/module-system/module-implementations/integration-tests/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpsee =  { workspace = true }
 
 sov-modules-api = { path = "../../sov-modules-api", features = ["native"] }
 sov-state = { path = "../../sov-state", features = ["native"] }
-sov-rollup-interface = { path = "../../../rollup-interface" }
+sov-rollup-interface = { path = "../../../rollup-interface", features = ["mocks"] }
 sov-schema-db = { path = "../../../full-node/db/sov-schema-db" }
 sov-data-generators = { path = "../../utils/sov-data-generators" }
 sov-modules-stf-template = { path = "../../sov-modules-stf-template", features = ["native"] }
diff --git a/module-system/module-implementations/module-template/Cargo.toml b/module-system/module-implementations/module-template/Cargo.toml
@@ -25,7 +25,6 @@ thiserror = { workspace = true }
 sov-bank = { path = "../sov-bank" }
 sov-modules-api = { path = "../../sov-modules-api" }
 sov-state = { path = "../../sov-state" }
-sov-rollup-interface = { path = "../../../rollup-interface" }
 
 
 [dev-dependencies]
diff --git a/module-system/module-implementations/sov-bank/Cargo.toml b/module-system/module-implementations/sov-bank/Cargo.toml
@@ -23,7 +23,6 @@ thiserror = { workspace = true }
 
 sov-modules-api = { path = "../../sov-modules-api", version = "0.3" }
 sov-state = { path = "../../sov-state", version = "0.3" }
-sov-rollup-interface = { path = "../../../rollup-interface", version = "0.3" }
 
 
 [dev-dependencies]
diff --git a/module-system/module-implementations/sov-blob-storage/Cargo.toml b/module-system/module-implementations/sov-blob-storage/Cargo.toml
@@ -32,7 +32,7 @@ clap = { workspace = true, optional = true }
 
 
 [dev-dependencies]
-sov-rollup-interface = { path = "../../../rollup-interface", features = ["mocks"] }
+sov-rollup-interface = { path = "../../../rollup-interface", version = "0.3", features = ["mocks"] }
 sov-blob-storage = { path = ".", features = ["native"] }
 sov-bank = { path = "../sov-bank" }
 tempfile = { workspace = true }
diff --git a/module-system/module-implementations/sov-chain-state/Cargo.toml b/module-system/module-implementations/sov-chain-state/Cargo.toml
@@ -20,13 +20,12 @@ jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"],
 
 sov-modules-api = { path = "../../sov-modules-api", version = "0.3" }
 sov-state = { path = "../../sov-state", version = "0.3" }
-sov-rollup-interface = { path = "../../../rollup-interface", version = "0.3" }
 
 [dev-dependencies]
 tempfile = { workspace = true }
 sov-data-generators = { path = "../../utils/sov-data-generators" }
 sov-chain-state = { path = ".", features = ["native"] }
-sov-rollup-interface = { path = "../../../rollup-interface", features = ["mocks"] }
+sov-rollup-interface = { path = "../../../rollup-interface", version = "0.3", features = ["mocks"] }
 
 
 [features]
diff --git a/module-system/module-implementations/sov-chain-state/src/genesis.rs b/module-system/module-implementations/sov-chain-state/src/genesis.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
+use sov_modules_api::da::Time;
 use sov_modules_api::WorkingSet;
-use sov_rollup_interface::da::Time;
 
 use crate::{ChainState, TransitionHeight};
 
diff --git a/module-system/module-implementations/sov-chain-state/src/hooks.rs b/module-system/module-implementations/sov-chain-state/src/hooks.rs
@@ -1,6 +1,6 @@
+use sov_modules_api::da::BlockHeaderTrait;
 use sov_modules_api::hooks::{FinalizeHook, SlotHooks};
 use sov_modules_api::{AccessoryWorkingSet, Context, Spec, WorkingSet};
-use sov_rollup_interface::da::BlockHeaderTrait;
 use sov_state::Storage;
 
 use super::ChainState;
diff --git a/module-system/module-implementations/sov-chain-state/src/lib.rs b/module-system/module-implementations/sov-chain-state/src/lib.rs
@@ -21,8 +21,8 @@ use borsh::{BorshDeserialize, BorshSerialize};
 pub use query::*;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
+use sov_modules_api::da::Time;
 use sov_modules_api::{DaSpec, Error, ModuleInfo, ValidityConditionChecker, WorkingSet};
-use sov_rollup_interface::da::Time;
 use sov_state::codec::BcsCodec;
 use sov_state::Storage;
 
diff --git a/module-system/module-implementations/sov-chain-state/src/tests.rs b/module-system/module-implementations/sov-chain-state/src/tests.rs
@@ -1,4 +1,4 @@
-use sov_rollup_interface::da::{NanoSeconds, Time};
+use sov_modules_api::da::{NanoSeconds, Time};
 
 use crate::ChainStateConfig;
 
diff --git a/module-system/module-implementations/sov-chain-state/tests/all_tests.rs b/module-system/module-implementations/sov-chain-state/tests/all_tests.rs
@@ -1,8 +1,8 @@
 use sov_chain_state::{ChainState, ChainStateConfig, StateTransitionId, TransitionInProgress};
+use sov_modules_api::da::BlockHeaderTrait;
 use sov_modules_api::default_context::DefaultContext;
 use sov_modules_api::hooks::SlotHooks;
 use sov_modules_api::{Genesis, WorkingSet};
-use sov_rollup_interface::da::BlockHeaderTrait;
 use sov_rollup_interface::mocks::{MockBlock, MockBlockHeader, MockDaSpec, MockValidityCond};
 use sov_rollup_interface::storage::StorageManager;
 use sov_state::config::Config;
diff --git a/module-system/module-implementations/sov-nft-module/Cargo.toml b/module-system/module-implementations/sov-nft-module/Cargo.toml
@@ -27,7 +27,6 @@ tokio = { version = "1.33.0", features=["full"], optional = true }
 tracing = { workspace = true, optional = true }
 
 [dev-dependencies]
-sov-rollup-interface = { path = "../../../rollup-interface" }
 sov-data-generators = { path = "../../utils/sov-data-generators" }
 tempfile = { workspace = true }
 sov-nft-module = { version = "*", features = ["native"], path = "." }
diff --git a/module-system/sov-modules-api/src/lib.rs b/module-system/sov-modules-api/src/lib.rs
@@ -70,6 +70,10 @@ pub mod optimistic {
     pub use sov_rollup_interface::optimistic::{Attestation, ProofOfBond};
 }
 
+pub mod da {
+    pub use sov_rollup_interface::da::{BlockHeaderTrait, NanoSeconds, Time};
+}
+
 impl AsRef<[u8]> for Address {
     fn as_ref(&self) -> &[u8] {
         &self.addr
diff --git a/module-system/sov-modules-stf-template/Cargo.toml b/module-system/sov-modules-stf-template/Cargo.toml
@@ -28,6 +28,7 @@ sov-zk-cycle-utils = { path = "../../utils/zk-cycle-utils", version = "0.3", opt
 risc0-zkvm = { workspace = true, default-features = false, features = ["std"], optional = true }
 risc0-zkvm-platform = { workspace = true, optional = true }
 jsonrpsee = { workspace = true, features = ["server"], optional = true }
+
 [features]
 bench = ["sov-zk-cycle-macros/bench", "sov-zk-cycle-utils", "risc0-zkvm", "risc0-zkvm-platform"]
 default = []

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use sov_rollup_interface::da::{NanoSeconds, Time};`
	`1`	`+use sov_modules_api::da::{NanoSeconds, Time};`
`2`	`2`
`3`	`3`	`use crate::ChainStateConfig;`
`4`	`4`