From 518a3f4836fd86935d7c9960c6bc65b6ff6627ad Mon Sep 17 00:00:00 2001 From: Victor Lopes Date: Thu, 16 Nov 2023 22:18:32 +0100 Subject: [PATCH] feat: add package structure (#5) * feat: update to package structure * rename dependencies to definitions --- external/sov-wasm/Cargo.lock | 1 - external/sov-wasm/Cargo.toml | 1 - external/sov-wasm/Makefile | 2 +- external/sov-wasm/assets/sov-wasm.wasm | Bin 301994 -> 301996 bytes external/sov-wasm/src/definitions.rs | 3 +++ external/sov-wasm/src/lib.rs | 15 +++++++-------- 6 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 external/sov-wasm/src/definitions.rs diff --git a/external/sov-wasm/Cargo.lock b/external/sov-wasm/Cargo.lock index 26ef038..9873666 100644 --- a/external/sov-wasm/Cargo.lock +++ b/external/sov-wasm/Cargo.lock @@ -5042,7 +5042,6 @@ version = "0.1.0" dependencies = [ "borsh", "demo-stf", - "serde", "serde_json", "sov-mock-da", "sov-modules-api", diff --git a/external/sov-wasm/Cargo.toml b/external/sov-wasm/Cargo.toml index a22e517..057b805 100644 --- a/external/sov-wasm/Cargo.toml +++ b/external/sov-wasm/Cargo.toml @@ -8,7 +8,6 @@ crate-type = ["cdylib", "rlib"] [dependencies] borsh = "0.10.3" -serde = "1.0" serde_json = "1.0" demo-stf = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "df169be", features = ["serde"] } sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "df169be", features = ["serde"] } diff --git a/external/sov-wasm/Makefile b/external/sov-wasm/Makefile index 83656ae..1319515 100644 --- a/external/sov-wasm/Makefile +++ b/external/sov-wasm/Makefile @@ -29,7 +29,7 @@ wasm: ## Build the WASM files $(PACKAGE_RESTORED_OPTIMIZED) @mv $(PACKAGE_THIN) $(PACKAGE_SHORT) @rm $(PACKAGE) - @echo "Package created: $(PACKAGE)" + @echo "Package created: $(PACKAGE_SHORT)" help: ## Display this help screen @grep -h \ diff --git a/external/sov-wasm/assets/sov-wasm.wasm b/external/sov-wasm/assets/sov-wasm.wasm index c45e745f33247ef8eb5348efda516cbd10e5c6f7..6acd84b25a768f314b30d3de48b2948ca699817d 100644 GIT binary patch delta 11718 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 diff --git a/external/sov-wasm/src/definitions.rs b/external/sov-wasm/src/definitions.rs new file mode 100644 index 0000000..f0e7cb8 --- /dev/null +++ b/external/sov-wasm/src/definitions.rs @@ -0,0 +1,3 @@ +pub type Context = sov_modules_api::default_context::ZkDefaultContext; +pub type DaSpec = sov_mock_da::MockDaSpec; +pub type RuntimeCall = demo_stf::runtime::RuntimeCall; diff --git a/external/sov-wasm/src/lib.rs b/external/sov-wasm/src/lib.rs index d4c4ebe..277ec55 100644 --- a/external/sov-wasm/src/lib.rs +++ b/external/sov-wasm/src/lib.rs @@ -6,14 +6,13 @@ use alloc::vec::Vec; use core::{mem, slice}; use borsh::{BorshDeserialize, BorshSerialize}; -use sov_mock_da::MockDaSpec; -use sov_modules_api::default_context::ZkDefaultContext; -use sov_modules_api::{Signature as _, Spec}; - -pub type Context = ZkDefaultContext; -pub type RuntimeCall = demo_stf::runtime::RuntimeCall; -pub type PublicKey = ::PublicKey; -pub type Signature = ::Signature; +use sov_modules_api::Signature as _; + +mod definitions; +use definitions::{Context, RuntimeCall}; + +pub type PublicKey = ::PublicKey; +pub type Signature = ::Signature; pub type Transaction = sov_modules_api::transaction::Transaction; #[cfg(test)]