[ᚬframework] feat(framework): Service executor.

Cargo.toml

@@ -50,6 +50,7 @@ members = [
 
   "binding-macro",
   "framework",
+  "build-in-services/asset",
 
   "protocol",
 ]

binding-macro/Cargo.toml

@@ -11,15 +11,15 @@ proc-macro = true
 doctest = false
 
 [dependencies]
-framework = { path = "../framework" }
+protocol = { path = "../protocol" }
 
 syn = { version = "1.0", features = ["full"] }
 proc-macro2 = "1.0"
 quote = "1.0"
+derive_more = "0.15"
+serde_json = "1.0"
 
 [dev-dependencies]
-protocol = { path = "../protocol" }
-
-serde_json = "1.0"
+framework = { path = "../framework" }
 bytes = "0.4"
 serde = { version = "1.0", features = ["derive"] }

binding-macro/src/lib.rs

@@ -3,13 +3,13 @@ extern crate proc_macro;
 mod common;
 mod cycles;
 mod read_write;
-mod servive;
+mod service;
 
 use proc_macro::TokenStream;
 
 use crate::cycles::gen_cycles_code;
 use crate::read_write::verify_read_or_write;
-use crate::servive::gen_service_code;
+use crate::service::gen_service_code;
 
 #[rustfmt::skip]
 /// `#[read]` marks a service method as readable.

binding-macro/src/servive.rs → binding-macro/src/service.rs

@@ -81,30 +81,32 @@ pub fn gen_service_code(_: TokenStream, item: TokenStream) -> TokenStream {
             }
 
             fn read_<Context: protocol::traits::RequestContext>(&self, ctx: Context) -> protocol::ProtocolResult<String> {
+                let service = ctx.get_service_name();
                 let method = ctx.get_service_method();
 
                 match method {
                     #(#list_read_name => {
                         let payload: #list_read_payload = serde_json::from_str(ctx.get_payload())
-                                .map_err(|e| framework::ServiceError::JsonParse(e))?;
+                                .map_err(|e| protocol::traits::BindingMacroError::JsonParse(e))?;
                         let res = self.#list_read_ident(ctx, payload)?;
-                        serde_json::to_string(&res).map_err(|e| framework::ServiceError::JsonParse(e).into())
+                        serde_json::to_string(&res).map_err(|e| protocol::traits::BindingMacroError::JsonParse(e).into())
                     },)*
-                    _ => Err(framework::ServiceError::NotFoundMethod(method.to_owned()).into())
+                    _ => Err(protocol::traits::BindingMacroError::NotFoundMethod{ service: service.to_owned(), method: method.to_owned() }.into())
                 }
             }
 
             fn write_<Context: protocol::traits::RequestContext>(&mut self, ctx: Context) -> protocol::ProtocolResult<String> {
+                let service = ctx.get_service_name();
                 let method = ctx.get_service_method();
 
                 match method {
                     #(#list_write_name => {
                         let payload: #list_write_payload = serde_json::from_str(ctx.get_payload())
-                                .map_err(|e| framework::ServiceError::JsonParse(e))?;
+                                .map_err(|e| protocol::traits::BindingMacroError::JsonParse(e))?;
                         let res = self.#list_write_ident(ctx, payload)?;
-                        serde_json::to_string(&res).map_err(|e| framework::ServiceError::JsonParse(e).into())
+                        serde_json::to_string(&res).map_err(|e| protocol::traits::BindingMacroError::JsonParse(e).into())
                     },)*
-                    _ => Err(framework::ServiceError::NotFoundMethod(method.to_owned()).into())
+                    _ => Err(protocol::traits::BindingMacroError::NotFoundMethod{ service: service.to_owned(), method: method.to_owned() }.into())
                 }
             }
         }

build-in-services/asset/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "asset"
+version = "0.1.0"
+authors = ["Muta Dev <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+binding-macro = { path = "../../binding-macro" }
+protocol = { path = "../../protocol" }
+
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+rlp = "0.4"
+bytes = "0.4"
+derive_more = "0.15"
+byteorder = "1.3"
+
+[dev-dependencies]
+cita_trie = "2.0"
+async-trait = "0.1"
+framework = { path = "../../framework" }