feat: use rust_util

2021-01-01 19:03:40 +08:00
parent 54856504a2
commit 6fef958a70
6 changed files with 174 additions and 36 deletions
--- a/__crypto/simple_contract/Cargo.lock
+++ b/__crypto/simple_contract/Cargo.lock
@@ -1,17 +1,52 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "arrayref"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"

+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

+[[package]]
+name = "blake2b_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -57,6 +92,12 @@ version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"

+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -66,6 +107,23 @@ dependencies = [
 "bitflags",
 ]

+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+dependencies = [
+ "autocfg 1.0.1",
+ "cfg-if",
+ "lazy_static",
+]
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -75,6 +133,17 @@ dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -96,6 +165,17 @@ dependencies = [
 "typenum",
 ]

+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.2"
@@ -108,6 +188,12 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "libc"
 version = "0.2.81"
@@ -144,7 +230,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
 "libc",
 "rand_chacha",
 "rand_core 0.4.2",
@@ -163,7 +249,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
 "rand_core 0.3.1",
 ]

@@ -231,7 +317,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
 "rand_core 0.4.2",
 ]

@@ -253,6 +339,23 @@ dependencies = [
 "rand_core 0.3.1",
 ]

+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_users"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "rust-argon2",
+]
+
 [[package]]
 name = "ripemd160"
 version = "0.8.0"
@@ -264,6 +367,30 @@ dependencies = [
 "opaque-debug",
 ]

+[[package]]
+name = "rust-argon2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+dependencies = [
+ "base64",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rust_util"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26a080a375b53e1a584388ac4c611f55e41629c79b40ed1c630d497b995c8cf8"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "term",
+ "term_size",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -341,6 +468,7 @@ dependencies = [
 "hex",
 "rand",
 "ripemd160",
+ "rust_util",
 "secp256k1",
 "serde",
 "serde_json",
@@ -358,6 +486,27 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "term"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+dependencies = [
+ "byteorder",
+ "dirs",
+ "winapi",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -370,6 +519,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
--- a/__crypto/simple_contract/Cargo.toml
+++ b/__crypto/simple_contract/Cargo.toml
@@ -16,3 +16,4 @@ ripemd160 = "0.8.0"
 sha2 = "0.8.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+rust_util = "0.6"
--- a/__crypto/simple_contract/src/credit.rs
+++ b/__crypto/simple_contract/src/credit.rs
@@ -1,6 +1,7 @@
 use std::{collections::HashMap, fs, fs::File};
+use rust_util::{SimpleError, XResult, simple_error};
 use serde::{Serialize, Deserialize};
-use crate::{tx::Transaction, util::{SimpleError, XResult}};
+use crate::{tx::Transaction};

 #[derive(Debug, Serialize, Deserialize)]
 pub struct CreditContract {
@@ -24,10 +25,10 @@ impl CreditContract {

    pub fn issue(&mut self, tx: &Transaction, receiver: &str, credit: u32) -> XResult<()> {
        if &self.admin != tx.sender.as_ref().ok_or_else(|| SimpleError::new("Sender is not provided".into()))? {
-            return Err(SimpleError::new(format!("Current user is not admin, {} vs {:?}", self.admin, tx.sender)).into())
+            return simple_error!("Current user is not admin, {} vs {:?}", self.admin, tx.sender);
        }
        if self.issue_amount + credit > self.credit_limit {
-            return Err(SimpleError::new(format!("Issue too much credit, current: {}, issue: {}, limit: {}", self.issue_amount, credit, self.credit_limit)).into());
+            return simple_error!("Issue too much credit, current: {}, issue: {}, limit: {}", self.issue_amount, credit, self.credit_limit);
        }
        match self.credit.get_mut(receiver) {
            None => { self.credit.insert(receiver.to_owned(), credit); },
@@ -39,7 +40,7 @@ impl CreditContract {

    pub fn transfer(&mut self, tx: &Transaction, receiver: &str, credit: u32) -> XResult<()> {
        match self.credit.get_mut(tx.sender.as_ref().ok_or_else(|| SimpleError::new("Sender is not provided".into()))?) {
-            None => return Err(SimpleError::new(format!("Have not enough credit: {:?}", tx.sender)).into()),
+            None => return simple_error!("Have not enough credit: {:?}", tx.sender),
            Some(cr) => {
                if *cr >= credit {
                    *cr -= credit;
@@ -48,7 +49,7 @@ impl CreditContract {
                        Some(receiver_credit) => *receiver_credit += credit,
                    }
                } else {
-                    return Err(SimpleError::new(format!("Have not enough credit: {:?}", tx.sender)).into());
+                    return simple_error!("Have not enough credit: {:?}", tx.sender);
                }
            },
        }
@@ -69,7 +70,7 @@ impl CreditContract {

    pub fn save(name: &str, c: &CreditContract) -> XResult<()> {
        if let Ok(_) = File::open(name) {
-            return Err(SimpleError::new(format!("File exists: {}", name)).into());
+            return simple_error!("File exists: {}", name);
        }
        fs::write(name, serde_json::to_string(c)?.as_bytes())?;
        Ok(())
--- a/__crypto/simple_contract/src/main.rs
+++ b/__crypto/simple_contract/src/main.rs
@@ -3,6 +3,7 @@ pub mod tx;
 pub mod credit;

 use std::str::FromStr;
+use rust_util::XResult;
 use secp256k1::{Message, Secp256k1, Signature};
 use util::*;

--- a/__crypto/simple_contract/src/tx.rs
+++ b/__crypto/simple_contract/src/tx.rs
@@ -1,7 +1,8 @@
+use rust_util::{XResult, simple_error};
 use secp256k1::{Message, PublicKey, Secp256k1, SecretKey, Signature};
 use serde::{Serialize, Deserialize};
 use std::str::FromStr;
-use crate::util::{SimpleError, XResult, calc_sha256, make_btc_address};
+use crate::util::{calc_sha256, make_btc_address};

 #[derive(Debug, Serialize, Deserialize)]
 pub struct Transaction {
@@ -42,7 +43,7 @@ impl Transaction {

    pub fn sign(&mut self, sender: &str, priv_key: &SecretKey) -> XResult<()> {
        if self.signature.is_some() {
-            Err(SimpleError::new("Transaction is signed!".into()).into())
+            simple_error!("Transaction is signed!")
        } else {
            let message = self.get_body_message()?;
            let sign = Secp256k1::new().sign(&message, priv_key);
@@ -55,12 +56,12 @@ impl Transaction {
    pub fn verify(&self, pub_key: &PublicKey) -> XResult<()> {
        match (&self.sender, &self.signature) {
            (None, None) | (None, Some(_)) | (Some(_), None) => {
-                Err(SimpleError::new("Transaction has no sender or not signed!".into()).into())
+                simple_error!("Transaction has no sender or not signed!")
            },
            (Some(sender), Some(sign_hex)) => {
                let address = make_btc_address(pub_key);
                if &address != sender {
-                    return Err(SimpleError::new("".into()).into());
+                    return simple_error!("Assress and sender not match!");
                }
                let message = self.get_body_message()?;
                let sig = Signature::from_str(sign_hex)?;
--- a/__crypto/simple_contract/src/util.rs
+++ b/__crypto/simple_contract/src/util.rs
@@ -1,32 +1,11 @@
 use rand::rngs::OsRng;
+use rust_util::XResult;
 use serde::{Deserialize, Serialize};
 use secp256k1::{Secp256k1, SecretKey, key::PublicKey};
 use sha2::Sha256;
 use ripemd160::Ripemd160;
 use digest::{ Input, FixedOutput };
-use std::{fmt::Display, str::FromStr};
-use std::error::Error;
-
-pub type XResult<T> = Result<T, Box<dyn Error>>;
-
-#[derive(Debug)]
-pub struct SimpleError {
-    pub message: String,
-}
-
-impl SimpleError {
-    pub fn new(message: String) -> Self {
-        Self { message }
-    }
-}
-
-impl Display for SimpleError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "SimpleErorr, message: {}", self.message)
-    }
-}
-
-impl Error for SimpleError {}
+use std::str::FromStr;

 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]