merge derive/macro crates.

.changes/config.json

@@ -73,18 +73,11 @@
   "packages": {
     "utils-derive": {
       "path": "./utils/utils-derive/",
-      "manager": "rust",
-      "publish": false
+      "manager": "rust"
     },
-    "runtime": {
+    "stronghold-runtime": {
       "path": "./engine/runtime/",
-      "manager": "rust",
-      "publish": false
-    },
-    "store": {
-      "path": "./engine/store/",
-      "manager": "rust",
-      "publish": false
+      "manager": "rust"
     },
     "communication-macros": {
       "path": "./communication/communication-macros",
@@ -93,35 +86,15 @@
     "stronghold-utils": {
       "path": "./utils/utils/",
       "manager": "rust",
-      "publish": false,
       "dependencies": [
         "utils-derive"
       ]
     },
-    "vault": {
-      "path": "./engine/vault/",
-      "manager": "rust",
-      "publish": false,
-      "dependencies": [
-        "stronghold-utils"
-      ]
-    },
-    "snapshot": {
-      "path": "./engine/snapshot/",
-      "manager": "rust",
-      "publish": false,
-      "dependencies": [
-        "stronghold-utils"
-      ]
-    },
     "stronghold-engine": {
       "path": "./engine/",
       "manager": "rust",
       "dependencies": [
-        "vault",
-        "snapshot",
-        "store",
-        "runtime"
+        "stronghold-runtime"
       ]
     },
     "stronghold-communication": {
@@ -137,9 +110,6 @@
       "manager": "rust",
       "dependencies": [
         "stronghold-engine",
-        "vault",
-        "snapshot",
-        "store",
         "stronghold-communication",
         "stronghold-utils",
         "runtime"
@@ -154,4 +124,4 @@
       ]
     }
   }
-}
+}

Cargo.toml

@@ -4,8 +4,8 @@ members = [
   "engine/runtime",
   "client",
   "communication",
-  "utils/utils",
-  "utils/utils-derive"
+  "utils",
+  "derive"
 ]
 exclude = [
   "products/commandline",

client/Cargo.toml

@@ -24,30 +24,30 @@ thiserror = "1.0"
 futures = "0.3"
 riker = "0.4"
 
-  [dependencies.stronghold-engine]
-  path = "../engine"
-  version = "0.3"
-
-  [dependencies.iota-crypto]
-  version = "0.5.0"
-  features = [
-  "random",
-  "ed25519",
-  "sha",
-  "hmac",
-  "bip39-en",
-  "slip10",
-  "chacha"
+[dependencies.stronghold-engine]
+path = "../engine"
+version = "0.3"
+
+[dependencies.iota-crypto]
+version = "0.5.0"
+features = [
+"random",
+"ed25519",
+"sha",
+"hmac",
+"bip39-en",
+"slip10",
+"chacha"
 ]
 
-  [dependencies.stronghold-communication]
-  path = "../communication"
-  optional = true
-  version = "0.4.0"
+[dependencies.stronghold-communication]
+path = "../communication"
+optional = true
+version = "0.4.0"
 
-  [dependencies.stronghold-utils]
-  path = "../utils/utils"
-  version = "0.2"
+[dependencies.stronghold-utils]
+path = "../utils"
+version = "0.2"
 
 [features]
 communication = [ "stronghold-communication" ]

communication/Cargo.toml

@@ -32,11 +32,11 @@ thiserror = "1.0"
 serde = { version = "1.0", default-features = false, features = [ "alloc", "derive" ] }
 serde_json = { version = "1.0", default-features = false, features = [ "alloc" ] }
 riker = "0.4"
-communication-macros = { path = "communication-macros", version = "0.1.1" }
+stronghold-derive = { path = "../derive", version = "0.1.0" }
 
-  [dependencies.stronghold-utils]
-  path = "../utils/utils"
-  version = "0.2"
+[dependencies.stronghold-utils]
+path = "../utils"
+version = "0.2"
 
 [features]
 default = [ "mdns" ]

communication/src/actor/firewall.rs

@@ -1,9 +1,9 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-pub use communication_macros::RequestPermissions;
 use libp2p::PeerId;
 use std::collections::HashMap;
+pub use stronghold_derive::RequestPermissions;
 
 /// The permission value for request variants.
 /// It is a  bit that is set at a certain index, therefore the value is always a power of 2.

utils/utils-derive/Cargo.toml → derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "utils-derive"
-version = "0.1.1"
+name = "stronghold-derive"
+version = "0.1.0"
 authors = [
   "IOTA Stiftung",
   "tensor-programming <tensordeveloper@gmail.com>"
@@ -11,5 +11,6 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
+syn = { version = "1.0", features = [ "parsing", "full", "extra-traits", "proc-macro" ] }
 quote = "1.0"
-syn = "1.0"
+proc-macro2 = "1.0"

communication/communication-macros/src/lib.rs → derive/src/comm.rs

@@ -1,51 +1,11 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-extern crate proc_macro;
-
 use proc_macro2::{Ident, TokenStream};
 use quote::quote;
-use syn::{Data, DataEnum, DeriveInput, Fields};
-
-/// Implements the [`VariantPermission`] for struct/ unions with PermissionValue(1).
-/// For enums, it implements [`ToPermissionVariants`], which creates an according new enum <Ident>Permission with Unit
-/// variants, and implements [`VariantPermission`] by assigning different [`PermissionValue`] for each variant.
-/// The permission value is the "index" in the enum as exponent for the power of 2, thus from top to bottom 1, 2, 4,
-/// 8...
-#[proc_macro_derive(RequestPermissions)]
-pub fn permissions(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let derive_input = syn::parse_macro_input!(input as DeriveInput);
-    let name = format!("{}Permission", derive_input.ident);
-    let name = syn::Ident::new(&name, derive_input.ident.span());
-    let gen = match derive_input.data {
-        Data::Enum(data_enum) => {
-            let unit_enum = build_plain(&name, &data_enum);
-            let impl_permission = impl_permission(&name, &data_enum);
-            let to_permissioned = impl_to_permissioned(&derive_input.ident, &name, &data_enum);
-
-            quote! {
-                #unit_enum
-                #impl_permission
-                #to_permissioned
-            }
-        }
-        Data::Struct(_) | Data::Union(_) => {
-            let ident = derive_input.ident.clone();
-            quote! {
-                impl VariantPermission for #ident {
-                    fn permission(&self) -> PermissionValue {
-                        // Only panics for values > 31.
-                        PermissionValue::new(0).unwrap()
-                    }
-                }
-
-            }
-        }
-    };
-    gen.into()
-}
+use syn::{DataEnum, Fields};
 
-fn build_plain(name: &Ident, data_enum: &DataEnum) -> TokenStream {
+pub fn build_plain(name: &Ident, data_enum: &DataEnum) -> TokenStream {
     let plain_variants = data_enum
         .variants
         .iter()
@@ -64,15 +24,15 @@ fn build_plain(name: &Ident, data_enum: &DataEnum) -> TokenStream {
     }
 }
 
-fn match_fields(fields: &Fields) -> TokenStream {
+pub fn match_fields(fields: &Fields) -> TokenStream {
     match fields {
         Fields::Unit => TokenStream::new(),
         Fields::Unnamed(..) => quote! { (..) },
         Fields::Named(..) => quote! { { .. } },
     }
 }
 
-fn impl_to_permissioned(input: &Ident, name: &Ident, data_enum: &DataEnum) -> TokenStream {
+pub fn impl_to_permissioned(input: &Ident, name: &Ident, data_enum: &DataEnum) -> TokenStream {
     let match_variants = data_enum
         .variants
         .iter()
@@ -95,7 +55,7 @@ fn impl_to_permissioned(input: &Ident, name: &Ident, data_enum: &DataEnum) -> To
     }
 }
 
-fn impl_permission(name: &Ident, data_enum: &DataEnum) -> TokenStream {
+pub fn impl_permission(name: &Ident, data_enum: &DataEnum) -> TokenStream {
     if data_enum.variants.len() > 32 {
         panic!("More then 32 variants on enums are not supported.");
     }