refactor: rename ink_revive to ink_revive_types

AlexD10S · AlexD10S · commit daaca1bf8f66 · 2025-09-25T14:50:43.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ members = [
     "crates/ink/ir",
     "crates/ink/macro",
     "crates/metadata",
-    "crates/revive",
+    "crates/revive-types",
     "crates/prelude",
     "crates/primitives",
     "crates/storage",
@@ -123,7 +123,7 @@ ink_macro = { version = "=6.0.0-alpha.4", path = "crates/ink/macro", default-fea
 ink_metadata = { version = "=6.0.0-alpha.4", path = "crates/metadata", default-features = false }
 ink_prelude = { version = "=6.0.0-alpha.4", path = "crates/prelude", default-features = false }
 ink_primitives = { version = "=6.0.0-alpha.4", path = "crates/primitives", default-features = false }
-ink_revive = {  version = "=6.0.0-alpha.4", path = "crates/revive", default-features = false }
+ink_revive_types = {  version = "=6.0.0-alpha.4", path = "crates/revive-types", default-features = false }
 ink_storage = { version = "=6.0.0-alpha.4", path = "crates/storage", default-features = false }
 ink_storage_traits = { version = "=6.0.0-alpha.4", path = "crates/storage/traits", default-features = false }
 
diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml
@@ -19,7 +19,7 @@ ink_e2e_macro = { workspace = true, default-features = true }
 ink = { workspace = true, default-features = true }
 ink_env = { workspace = true, default-features = true }
 ink_primitives = { workspace = true, default-features = true }
-ink_revive = { workspace = true, default-features = true }
+ink_revive_types = { workspace = true, default-features = true }
 ink_sandbox = { version = "=6.0.0-alpha.4", path = "./sandbox", optional = true }
 
 cargo_metadata = { workspace = true }
@@ -71,7 +71,7 @@ std = [
     "sp-runtime-interface/std",
 	"sp-weights/std",
 	"ink_e2e_macro/std",
-	"ink_revive/std",
+	"ink_revive_types/std",
 	"ink_sandbox?/std",
 	"frame-support/std",
 ]
diff --git a/crates/e2e/sandbox/Cargo.toml b/crates/e2e/sandbox/Cargo.toml
@@ -23,7 +23,7 @@ sp-externalities = { workspace = true }
 sp-runtime = { workspace = true }
 sp-io = { workspace = true }
 ink_primitives = { workspace = true }
-ink_revive = { workspace = true }
+ink_revive_types = { workspace = true }
 
 paste = { workspace = true }
 scale-info = { workspace = true }
@@ -38,7 +38,7 @@ std = [
 	"frame-system/std",
 	"frame-metadata/std",
 	"ink_primitives/std",
-	"ink_revive/std",
+	"ink_revive_types/std",
 	"pallet-balances/std",
 	"pallet-revive/std",
 	"pallet-timestamp/std",
diff --git a/crates/e2e/sandbox/src/lib.rs b/crates/e2e/sandbox/src/lib.rs
@@ -17,7 +17,7 @@ use frame_system::{
     },
 };
 use ink_primitives::U256;
-use ink_revive::evm::{
+use ink_revive_types::evm::{
     CallLog,
     CallTrace,
 };
@@ -175,7 +175,8 @@ where
     native_to_eth_ratio.saturating_mul(evm_value)
 }
 
-/// Convert a `pallet_revive::CallTrace` (sandbox) into an `ink_revive::CallTrace` (API).
+/// Convert a `pallet_revive::CallTrace` (sandbox) into an `ink_revive_types::CallTrace`
+/// (API).
 pub fn to_revive_trace(t: pallet_revive::evm::CallTrace) -> CallTrace {
     CallTrace {
         from: t.from,
@@ -204,25 +205,33 @@ pub fn to_revive_trace(t: pallet_revive::evm::CallTrace) -> CallTrace {
     }
 }
 
-/// Convert a `pallet_revive::CallType` into an `ink_revive::evm::CallType`.
-fn to_revive_call_type(ct: pallet_revive::evm::CallType) -> ink_revive::evm::CallType {
+/// Convert a `pallet_revive::CallType` into an `ink_revive_types::evm::CallType`.
+fn to_revive_call_type(
+    ct: pallet_revive::evm::CallType,
+) -> ink_revive_types::evm::CallType {
     match ct {
-        pallet_revive::evm::CallType::Call => ink_revive::evm::CallType::Call,
-        pallet_revive::evm::CallType::StaticCall => ink_revive::evm::CallType::StaticCall,
+        pallet_revive::evm::CallType::Call => ink_revive_types::evm::CallType::Call,
+        pallet_revive::evm::CallType::StaticCall => {
+            ink_revive_types::evm::CallType::StaticCall
+        }
         pallet_revive::evm::CallType::DelegateCall => {
-            ink_revive::evm::CallType::DelegateCall
+            ink_revive_types::evm::CallType::DelegateCall
         }
-        pallet_revive::evm::CallType::Create => ink_revive::evm::CallType::Create,
-        pallet_revive::evm::CallType::Create2 => ink_revive::evm::CallType::Create2,
+        pallet_revive::evm::CallType::Create => ink_revive_types::evm::CallType::Create,
+        pallet_revive::evm::CallType::Create2 => ink_revive_types::evm::CallType::Create2,
     }
 }
 
-/// Convert a `ink_revive::StorageDeposit` into an `ink_revive::StorageDeposit`.
+/// Convert a `pallet_revive::StorageDeposit` into an `ink_revive_types::StorageDeposit`.
 pub fn to_revive_storage_deposit<B>(
     sd: pallet_revive::StorageDeposit<B>,
-) -> ink_revive::StorageDeposit<B> {
+) -> ink_revive_types::StorageDeposit<B> {
     match sd {
-        pallet_revive::StorageDeposit::Charge(b) => ink_revive::StorageDeposit::Charge(b),
-        pallet_revive::StorageDeposit::Refund(b) => ink_revive::StorageDeposit::Refund(b),
+        pallet_revive::StorageDeposit::Charge(b) => {
+            ink_revive_types::StorageDeposit::Charge(b)
+        }
+        pallet_revive::StorageDeposit::Refund(b) => {
+            ink_revive_types::StorageDeposit::Refund(b)
+        }
     }
 }
diff --git a/crates/e2e/src/backend.rs b/crates/e2e/src/backend.rs
@@ -21,7 +21,7 @@ use ink_primitives::{
     H160,
     abi::AbiEncodeWith,
 };
-use ink_revive::evm::CallTrace;
+use ink_revive_types::evm::CallTrace;
 use jsonrpsee::core::async_trait;
 use sp_weights::Weight;
 use subxt::dynamic::Value;
diff --git a/crates/e2e/src/contract_results.rs b/crates/e2e/src/contract_results.rs
@@ -36,7 +36,7 @@ use ink_primitives::{
     H256,
     MessageResult,
 };
-use ink_revive::{
+use ink_revive_types::{
     CodeUploadResult,
     ExecReturnValue,
     InstantiateReturnValue,
diff --git a/crates/e2e/src/error.rs b/crates/e2e/src/error.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ink_revive::evm::CallTrace;
+use ink_revive_types::evm::CallTrace;
 use std::fmt;
 
 /// An error occurred while interacting with the E2E backend.
diff --git a/crates/e2e/src/lib.rs b/crates/e2e/src/lib.rs
@@ -53,7 +53,7 @@ pub use contract_results::{
     UploadResult,
 };
 pub use ink_e2e_macro::test;
-pub use ink_revive::evm::CallTrace;
+pub use ink_revive_types::evm::CallTrace;
 pub use node_proc::{
     TestNodeProcess,
     TestNodeProcessBuilder,
diff --git a/crates/e2e/src/sandbox_client.rs b/crates/e2e/src/sandbox_client.rs
@@ -62,7 +62,7 @@ use ink_primitives::{
     U256,
     abi::AbiEncodeWith,
 };
-use ink_revive::{
+use ink_revive_types::{
     CodeUploadReturnValue,
     ExecReturnValue,
     InstantiateReturnValue,
diff --git a/crates/e2e/src/subxt_client.rs b/crates/e2e/src/subxt_client.rs
@@ -73,7 +73,7 @@ use ink_primitives::{
     DepositLimit,
     abi::AbiEncodeWith,
 };
-use ink_revive::evm::CallTrace;
+use ink_revive_types::evm::CallTrace;
 use jsonrpsee::core::async_trait;
 use scale::{
     Decode,
diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs
@@ -29,7 +29,7 @@ use ink_primitives::{
     Address,
     DepositLimit,
 };
-use ink_revive::{
+use ink_revive_types::{
     CodeUploadResult,
     evm::{
         CallTrace,
diff --git a/crates/revive-types/Cargo.toml b/crates/revive-types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ink_revive"
+name = "ink_revive_types"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
diff --git a/crates/revive-types/src/evm.rs b/crates/revive-types/src/evm.rs
diff --git a/crates/revive-types/src/hex_serde.rs b/crates/revive-types/src/hex_serde.rs
diff --git a/crates/revive-types/src/lib.rs b/crates/revive-types/src/lib.rs
diff --git a/crates/revive-types/src/primitives.rs b/crates/revive-types/src/primitives.rs
diff --git a/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml b/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml
@@ -12,7 +12,7 @@ sha3 = { version = "0.10", default-features = false }
 [dev-dependencies]
 ink_e2e = { path = "../../../crates/e2e", features = ["sandbox"] }
 ink_sandbox = { path = "../../../crates/e2e/sandbox" }
-ink_revive = { path = "../../../crates/revive" }
+ink_revive_types = { path = "../../../crates/revive-types" }
 sha3 = { version = "0.10" }
 other-contract-sol = { path = "other-contract-sol" }
 
diff --git a/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs b/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs
@@ -12,7 +12,7 @@ use ink::{
     SolEncode,
     primitives::DepositLimit,
 };
-use ink_revive::ExecReturnValue;
+use ink_revive_types::ExecReturnValue;
 use ink_sandbox::frame_system::pallet_prelude::OriginFor;
 
 const STORAGE_DEPOSIT_LIMIT: DepositLimit<u128> = DepositLimit::UnsafeOnlyForDryRun;
diff --git a/integration-tests/solidity-abi/sol-encoding/Cargo.toml b/integration-tests/solidity-abi/sol-encoding/Cargo.toml
@@ -11,7 +11,7 @@ ink = { path = "../../../crates/ink", default-features = false }
 [dev-dependencies]
 ink_e2e = { path = "../../../crates/e2e", features = ["sandbox"] }
 ink_sandbox = { path = "../../../crates/e2e/sandbox" }
-ink_revive = { path = "../../../crates/revive" }
+ink_revive_types = { path = "../../../crates/revive-types" }
 sha3 = { version = "0.10" }
 
 [lib]
diff --git a/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs b/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs
@@ -6,7 +6,7 @@ use ink::{
     primitives::DepositLimit,
 };
 use ink_e2e::ContractsRegistry;
-use ink_revive::ExecReturnValue;
+use ink_revive_types::ExecReturnValue;
 use ink_sandbox::{
     DefaultSandbox,
     Sandbox,
