fix: get macro tests building

crates/keystore/Cargo.toml

@@ -35,7 +35,7 @@ alloy-signer = { workspace = true, optional = true }
 alloy-signer-local = { workspace = true, optional = true, features = ["mnemonic"] }
 
 # Substrate dependencies (optional)
-sp-core = { workspace = true }
+sp-core = { workspace = true, optional = true }
 sp-io = { workspace = true, optional = true }
 subxt = { workspace = true, features = ["substrate-compat"], optional = true }
 subxt-core = { workspace = true, optional = true }
@@ -92,7 +92,7 @@ std = [
 	"rust-bls-bn254?/std",
 	# Conditional std enables for protocols
 	"alloy-primitives?/std",
-	"sp-core/std",
+	"sp-core?/std",
 	"sp-io?/std",
 	"subxt-core?/std",
 	"subxt?/native",
@@ -105,7 +105,7 @@ sr25519-schnorrkel = ["schnorrkel", "hex", "gadget-crypto/sr25519-schnorrkel"]
 zebra = ["ed25519-zebra", "hex", "gadget-crypto/ed25519"]
 bls = ["w3f-bls", "hex", "gadget-crypto/bls"]
 bn254 = ["ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "gadget-crypto/bn254"]
-sp-core = ["gadget-crypto/sp-core"]
+sp-core = ["dep:sp-core", "gadget-crypto/sp-core"]
 
 # Meant to be used in conjunction with `tangle` feature (for `sp-core`)
 substrate = ["paste", "sp-core", "sp-io", "subxt", "subxt-core", "tangle-subxt", "gadget-crypto/sp-core"]

crates/macros/blueprint-proc-macro/Cargo.toml

@@ -23,8 +23,8 @@ serde_json = { workspace = true, features = ["alloc"] }
 indexmap = { workspace = true }
 
 [dev-dependencies]
+blueprint-sdk = { workspace = true, features = ["std", "macros", "evm", "tangle", "eigenlayer", "testing"] }
 gadget-event-listeners = { workspace = true, features = ["testing"] }
-gadget-macros = { workspace = true, features = ["std", "tangle", "evm"] }
 
 trybuild = { workspace = true }
 

crates/macros/blueprint-proc-macro/tests/invalid_cases/job/01_invalid_params_syntax.rs

@@ -1,4 +1,4 @@
-use gadget_blueprint_proc_macro::job;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, params(n t), result(Vec<u8>))]
 fn keygen(n: u16, t: u8) -> Vec<u8> {

crates/macros/blueprint-proc-macro/tests/invalid_cases/job/02_invalid_result_syntax.rs

@@ -1,4 +1,4 @@
-use gadget_blueprint_proc_macro::job;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, params(n), result(Vec<u8> String))]
 fn keygen(n: u16) -> (Vec<u8>, String) {

crates/macros/blueprint-proc-macro/tests/invalid_cases/job/03_undefined_param.rs

@@ -1,4 +1,4 @@
-use gadget_blueprint_proc_macro::job;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, params(n, t), event_listener(listener = null), result(Vec<u8>))]
 fn keygen(n: u16, vec: Vec<u8>) -> Result<Vec<u8>, String> {

crates/macros/blueprint-proc-macro/tests/invalid_cases/job/04_missing_id.rs

@@ -1,4 +1,4 @@
-use gadget_blueprint_proc_macro::job;
+use blueprint_sdk::macros::job;
 
 #[job(params(n), result(Vec<u8>))]
 fn keygen(n: u16) -> Vec<u8> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/array_return_type.rs

@@ -1,6 +1,6 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(_))]
 #[allow(clippy::unused_unit)]

crates/macros/blueprint-proc-macro/tests/valid_cases/job/complex_types.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(Vec<u8>, String))]
 fn keygen(ctx: EmptyContext, n: u16) -> Result<(Vec<u8>, String), Infallible> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/custom_return_type.rs

@@ -1,6 +1,6 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
 
 pub struct TestReturnType;
 

crates/macros/blueprint-proc-macro/tests/valid_cases/job/function_with_explicit_empty_return_type.rs

@@ -1,6 +1,6 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(_))]
 #[allow(clippy::unused_unit)]

crates/macros/blueprint-proc-macro/tests/valid_cases/job/function_without_return_type.rs

@@ -1,6 +1,6 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(_))]
 fn keygen(ctx: EmptyContext, n: u16) {}

crates/macros/blueprint-proc-macro/tests/valid_cases/job/infer_result.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>))]
 fn keygen(ctx: EmptyContext, n: u16) -> Result<Vec<u8>, Infallible> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/mixed_types.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<(u16, String), EmptyContext>))]
 fn keygen(ctx: EmptyContext, args: (u16, String)) -> Result<Vec<u8>, Infallible> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/multiple_params.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<(u16, u8), EmptyContext>), result(Vec<u8>))]
 fn keygen(ctx: EmptyContext, args: (u16, u8)) -> Result<Vec<u8>, Infallible> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/multiple_results.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(Vec<u8>, String))]
 fn keygen(ctx: EmptyContext, n: u16) -> Result<(Vec<u8>, String), Infallible> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/non_result_return_type.rs

@@ -1,6 +1,6 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
 
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(Vec<u8>))]
 fn keygen(ctx: EmptyContext, n: u16) -> Vec<u8> {

crates/macros/blueprint-proc-macro/tests/valid_cases/job/simple.rs

@@ -1,7 +1,7 @@
 use crate::EmptyContext;
-use gadget_blueprint_proc_macro::job;
-use gadget_event_listeners::core::testing::PendingEventListener;
-use gadget_std::convert::Infallible;
+use blueprint_sdk::event_listeners::core::testing::PendingEventListener;
+use blueprint_sdk::macros::job;
+use blueprint_sdk::std::convert::Infallible;
 
 /// A simple job that generates a key of length `n`
 #[job(id = 0, event_listener(listener = PendingEventListener<u16, EmptyContext>), result(Vec<u8>))]

crates/sdk/Cargo.toml

@@ -118,6 +118,7 @@ networking = [
 	"gadget-clients/networking",
 	"gadget-keystore/std",
 	"gadget-config/networking",
+	"gadget-macros?/networking",
 ]
 
 p2p = ["gadget-context-derive/networking"]

crates/sdk/src/lib.rs

@@ -63,8 +63,8 @@ pub use gadget_utils as utils;
 pub use gadget_config as config;
 pub use gadget_keystore as keystore;
 pub use gadget_std as std;
-pub use serde;
 pub use tokio;
+pub use serde;
 
 #[cfg(feature = "local-store")]
 pub use gadget_stores as stores;