Fixing clippy linter (#81)

Author: tommady

.github/workflows/main.yml

@@ -16,11 +16,15 @@ jobs:
       with:
         toolchain: nightly
         override: true
-        components: rustfmt
+        components: rustfmt, clippy
     - uses: actions-rs/cargo@v1
       with:
         command: fmt
-        args: -- --check
+        args: --all -- --check
+    - uses: actions-rs/cargo@v1
+      with:
+        command: clippy
+        args: --all-targets --all-features -- -D warnings 
     - uses: actions-rs/cargo@v1
       with:
         command: build

.github/workflows/pr_main.yml

@@ -16,11 +16,15 @@ jobs:
       with:
         toolchain: nightly
         override: true
-        components: rustfmt
+        components: rustfmt, clippy
     - uses: actions-rs/cargo@v1
       with:
         command: fmt
-        args: -- --check
+        args: --all -- --check
+    - uses: actions-rs/cargo@v1
+      with:
+        command: clippy
+        args: --all-targets --all-features -- -D warnings 
     - uses: actions-rs/cargo@v1
       with:
         command: build

abcf/src/entry/context/events.rs

@@ -18,20 +18,10 @@ impl<'a> EventContext<'a> {
     }
 }
 
+#[derive(Default)]
 pub struct EventContextImpl {
     pub begin_block_events: Vec<abci::Event>,
     pub check_tx_events: Vec<abci::Event>,
     pub deliver_tx_events: Vec<abci::Event>,
     pub end_block_events: Vec<abci::Event>,
 }
-
-impl Default for EventContextImpl {
-    fn default() -> Self {
-        Self {
-            begin_block_events: Vec::new(),
-            check_tx_events: Vec::new(),
-            deliver_tx_events: Vec::new(),
-            end_block_events: Vec::new(),
-        }
-    }
-}

abcf/src/entry/node.rs

@@ -168,7 +168,7 @@ where
             }
         }
 
-        let events = mem::replace(&mut self.events.deliver_tx_events, Vec::new());
+        let events = mem::take(&mut self.events.deliver_tx_events);
 
         resp.events = events;
 
@@ -185,9 +185,10 @@ where
     M: Module + Application + RPCs,
 {
     async fn init_chain(&mut self, _request: RequestInitChain) -> ResponseInitChain {
-        let mut resp = ResponseInitChain::default();
-
-        resp.app_hash = self.stateful.root().expect("get app hash failed").to_vec();
+        let resp = ResponseInitChain {
+            app_hash: self.stateful.root().expect("get app hash failed").to_vec(),
+            ..Default::default()
+        };
 
         self.stateful
             .commit()
@@ -201,10 +202,11 @@ where
     }
 
     async fn info(&mut self, _request: RequestInfo) -> ResponseInfo {
-        let mut resp = ResponseInfo::default();
-
-        resp.version = String::from(self.module.metadata().impl_version);
-        resp.app_version = self.module.metadata().version;
+        let mut resp = ResponseInfo {
+            version: String::from(self.module.metadata().impl_version),
+            app_version: self.module.metadata().version,
+            ..Default::default()
+        };
 
         // compare height.
         let stateful_height = self
@@ -245,7 +247,7 @@ where
     }
 
     async fn query(&mut self, request: RequestQuery) -> ResponseQuery {
-        let mut paths = request.path.splitn(2, "/");
+        let mut paths = request.path.splitn(2, '/');
 
         let mut resp = ResponseQuery::default();
 
@@ -321,7 +323,7 @@ where
 
         self.module.begin_block(&mut ctx, req).await;
 
-        let events = mem::replace(begin_block_events, Vec::new());
+        let events = mem::take(begin_block_events);
 
         resp.events = events;
 
@@ -348,7 +350,7 @@ where
         resp.consensus_param_updates = result.consensus_param_updates;
         resp.validator_updates = result.validator_updates;
 
-        let events = mem::replace(end_block_events, Vec::new());
+        let events = mem::take(end_block_events);
 
         resp.events = events;
 

abcf/src/error.rs

@@ -41,8 +41,8 @@ impl Error {
             Error::NoRPCMethod => 10006,
 
             Error::TempOnlySupportRPC => 90001,
-            Error::RPCApplicationError(code, _) => code.clone(),
-            Error::ABCIApplicationError(code, _) => code.clone(),
+            Error::RPCApplicationError(code, _) => *code,
+            Error::ABCIApplicationError(code, _) => *code,
             Error::BS3Error(_) => 20001,
         }
     }

abcf/src/manager/manager.rs

@@ -5,7 +5,8 @@ use crate::{
     framework::{context::CallContext, EventContextImpl},
     module::{Application, Module, ModuleMetadata, RPCs},
     Error, ModuleError, ModuleResult, Result,
-};Ause alloc::collections::BTreeMap;
+};
+use alloc::collections::BTreeMap;
 use alloc::{
     boxed::Box,
     string::{String, ToString},
@@ -194,7 +195,7 @@ impl<S: bs3::Store> tm_abci::Application for Node<S> {
             }
         }
 
-        let check_tx_events = mem::replace(&mut events.check_tx_events, Vec::new());
+        let check_tx_events = mem::take(&mut events.check_tx_events);
 
         match serde_json::to_vec(&data_map) {
             Ok(v) => resp.data = v,
@@ -227,7 +228,7 @@ impl<S: bs3::Store> tm_abci::Application for Node<S> {
             app.begin_block(&mut context, &req).await;
         }
 
-        let begin_block_events = mem::replace(&mut events.begin_block_events, Vec::new());
+        let begin_block_events = mem::take(&mut events.begin_block_events);
 
         abci::ResponseBeginBlock {
             events: begin_block_events,
@@ -275,7 +276,7 @@ impl<S: bs3::Store> tm_abci::Application for Node<S> {
             }
         }
 
-        let deliver_tx_events = mem::replace(&mut events.deliver_tx_events, Vec::new());
+        let deliver_tx_events = mem::take(&mut events.deliver_tx_events);
 
         match serde_json::to_vec(&data_map) {
             Ok(v) => resp.data = v,
@@ -317,7 +318,7 @@ impl<S: bs3::Store> tm_abci::Application for Node<S> {
             resp.consensus_param_updates = resp.consensus_param_updates;
         }
 
-        let end_block_events = mem::replace(&mut events.end_block_events, Vec::new());
+        let end_block_events = mem::take(&mut events.end_block_events);
 
         resp.validator_updates = validator_updates_vec;
         resp.events = end_block_events;

abcf/src/manager/mod.rs

@@ -5,3 +5,32 @@ pub use context::{
 
 mod prelude;
 pub use prelude::ModuleStorage;
+
+/// Module.
+pub trait Module {
+    fn metadata(&self) -> ModuleMetadata<'_>;
+}
+
+pub enum ModuleType {
+    Module,
+    Manager,
+}
+
+/// Metadata of module.
+pub struct ModuleMetadata<'a> {
+    /// Name of module.
+    pub name: &'a str,
+    /// type of module.
+    pub module_type: ModuleType,
+    /// Version of module. If this version change, means module need update.
+    pub version: u64,
+    /// Version of impl. If this version change, means module only a change of impl.
+    pub impl_version: &'a str,
+    /// Genesis info.
+    pub genesis: Genesis,
+}
+
+/// Genesis for module.
+pub struct Genesis {
+    pub target_height: u64,
+}

abcf/src/module/mod.rs

@@ -14,8 +14,34 @@ pub use events::{Event, EventAttr, EventValue};
 mod storages;
 pub use storages::{Merkle, Storage, StorageTransaction};
 
-mod module;
-pub use module::{Genesis, Module, ModuleMetadata, ModuleType};
-
 mod callable;
 pub use callable::Callable;
+
+/// Module.
+pub trait Module {
+    fn metadata(&self) -> ModuleMetadata<'_>;
+}
+
+pub enum ModuleType {
+    Module,
+    Manager,
+}
+
+/// Metadata of module.
+pub struct ModuleMetadata<'a> {
+    /// Name of module.
+    pub name: &'a str,
+    /// type of module.
+    pub module_type: ModuleType,
+    /// Version of module. If this version change, means module need update.
+    pub version: u64,
+    /// Version of impl. If this version change, means module only a change of impl.
+    pub impl_version: &'a str,
+    /// Genesis info.
+    pub genesis: Genesis,
+}
+
+/// Genesis for module.
+pub struct Genesis {
+    pub target_height: u64,
+}

abcf/src/module/module.rs

@@ -21,8 +21,8 @@ fn main() {
 
     if let Ok(abci_event) = e.to_abci_event() {
         assert_eq!(e.name(), "E");
-        assert_eq!(abci_event.attributes[0].index, true);
-        assert_eq!(abci_event.attributes[3].index, true);
+        assert!(abci_event.attributes[0].index);
+        assert!(abci_event.attributes[3].index);
 
         assert_eq!(
             abci_event.attributes[0].key,

macros/examples/event.rs

@@ -29,14 +29,9 @@ impl Application for DepModule {
     type Transaction = DepsTransaction;
 }
 
+#[derive(Default)]
 pub struct DepsTransaction {}
 
-impl Default for DepsTransaction {
-    fn default() -> Self {
-        Self {}
-    }
-}
-
 impl TryFrom<&SimpleNodeTransaction> for DepsTransaction {
     type Error = abcf::Error;
 
@@ -81,27 +76,16 @@ impl Application for MockModule {
     }
 }
 
+#[derive(Default)]
 pub struct MockTransaction {}
 
-impl Default for MockTransaction {
-    fn default() -> Self {
-        MockTransaction {}
-    }
-}
-
-#[derive(Serialize, Deserialize)]
+#[derive(Default, Serialize, Deserialize)]
 pub struct SimpleNodeTransaction {
     pub v: u64,
 }
 
 impl abcf::Transaction for SimpleNodeTransaction {}
 
-impl Default for SimpleNodeTransaction {
-    fn default() -> Self {
-        Self { v: 0 }
-    }
-}
-
 impl abcf::module::FromBytes for SimpleNodeTransaction {
     fn from_bytes(bytes: &[u8]) -> abcf::Result<Self>
     where

macros/examples/manager.rs

@@ -21,16 +21,12 @@ pub fn event(input: TokenStream) -> TokenStream {
     parsed.fields.iter().for_each(|f| {
         let mut index = false;
         f.attrs.iter().for_each(|a| {
-            a.path
-                .segments
-                .iter()
-                .for_each(|s| match s.ident.to_string().as_str() {
-                    "abcf" => {
-                        index_is_false_str += &*(count.to_string() + ",");
-                        index = true;
-                    }
-                    _ => {}
-                });
+            a.path.segments.iter().for_each(|s| {
+                if s.ident.to_string().as_str() == "abcf" {
+                    index_is_false_str += &*(count.to_string() + ",");
+                    index = true;
+                }
+            });
         });
         key_vec.push(f.ident.as_ref());
         key_str_vec.push(f.ident.clone().unwrap().to_string());