7 files changed, 449 insertions, 416 deletions

diff --git a/examples/serdeser.rs b/examples/serdeser.rs
index 60d90b9..4fdfdc2 100644
--- a/examples/serdeser.rs
+++ b/examples/serdeser.rs
@@ -4,9 +4,8 @@ use serde_json;
 pub fn main() {
 
     let tx = Transaction {
-        by: "fingerprint_of_some_guy".to_owned(),
-        source: "31415926535897932384626433832795028841971693993751058209749445923".to_owned(),
-        target: "fingerprint_of_some_guy".to_owned(),
+        source: "fingerprint_of_some_guy".to_owned(),
+        target: "31415926535897932384626433832795028841971693993751058209749445923".to_owned(),
         amount: 2,
         timestamp: chrono::NaiveDate::from_ymd(2021, 04, 13).and_hms(20, 55, 30),
     };
diff --git a/src/handlers.rs b/src/handlers.rs
index ca41b61..123f70e 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -4,6 +4,7 @@ use askama::Template;
 use blake2::{Blake2s, Digest};
 use block_modes::block_padding::Pkcs7;
 use block_modes::{BlockMode, Cbc};
+use chrono::Utc;
 use jsonwebtoken::errors::ErrorKind;
 use jsonwebtoken::{decode, Algorithm, DecodingKey, TokenData, Validation};
 use log::{debug, warn};
@@ -259,8 +260,7 @@ pub async fn authenticate_user(
         }
     }
 
-    // We're using this as the validator
-    // I hate myself
+    // We're using this as the validator instead of anything reasonable
     if DecodingKey::from_rsa_pem(request.public_key.as_bytes()).is_err() {
         let res_json = warp::reply::json(&GradeCoinResponse {
             res: ResponseType::Error,
@@ -311,7 +311,6 @@ pub async fn authenticate_user(
 
 /// GET /transaction
 /// Returns JSON array of transactions
-/// Cannot fail
 pub async fn list_transactions(db: Db) -> Result<impl warp::Reply, Infallible> {
     debug!("GET /transaction, list_transactions() is handling");
     let mut result = HashMap::new();
@@ -341,8 +340,6 @@ pub async fn propose_block(
 ) -> Result<impl warp::Reply, warp::Rejection> {
     debug!("POST /block, propose_block() is handling");
 
-    let users_store = db.users.upgradable_read();
-
     warn!("New block proposal: {:?}", &new_block);
 
     if new_block.transaction_list.len() < BLOCK_TRANSACTION_COUNT as usize {
@@ -363,7 +360,30 @@ pub async fn propose_block(
     }
 
     // proposer (first transaction fingerprint) checks
-    let internal_user = match users_store.get(&new_block.transaction_list[0]) {
+
+    let pending_transactions = db.pending_transactions.upgradable_read();
+
+    let internal_user_fingerprint = match pending_transactions.get(&new_block.transaction_list[0]) {
+        Some(coinbase) => &coinbase.source,
+        None => {
+            debug!(
+                "User with public key signature {:?} is not found in the database",
+                new_block.transaction_list[0]
+            );
+
+            let res_json = warp::reply::json(&GradeCoinResponse {
+                res: ResponseType::Error,
+                message: "User with that public key signature is not found in the database"
+                    .to_owned(),
+            });
+
+            return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
+        }
+    };
+
+    let users_store = db.users.upgradable_read();
+
+    let internal_user = match users_store.get(internal_user_fingerprint) {
         Some(existing_user) => existing_user,
         None => {
             debug!(
@@ -433,19 +453,16 @@ pub async fn propose_block(
     }
 
     // Scope the RwLocks, there are hashing stuff below
-    {
-        let pending_transactions = db.pending_transactions.read();
 
-        // Are transactions in the block valid?
-        for transaction_hash in new_block.transaction_list.iter() {
-            if !pending_transactions.contains_key(transaction_hash) {
-                let res_json = warp::reply::json(&GradeCoinResponse {
-                    res: ResponseType::Error,
-                    message: "Block contains unknown transaction".to_owned(),
-                });
+    // Are transactions in the block valid?
+    for transaction_hash in new_block.transaction_list.iter() {
+        if !pending_transactions.contains_key(transaction_hash) {
+            let res_json = warp::reply::json(&GradeCoinResponse {
+                res: ResponseType::Error,
+                message: "Block contains unknown transaction".to_owned(),
+            });
 
-                return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
-            }
+            return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
         }
     }
 
@@ -487,9 +504,9 @@ pub async fn propose_block(
     // All clear, block accepted!
     warn!("ACCEPTED BLOCK {:?}", new_block);
 
-    // Scope the pending_transactions
+    // Scope the read guards
     {
-        let mut pending_transactions = db.pending_transactions.write();
+        let mut pending_transactions = RwLockUpgradableReadGuard::upgrade(pending_transactions);
         let mut users_store = RwLockUpgradableReadGuard::upgrade(users_store);
 
         for fingerprint in new_block.transaction_list.iter() {
@@ -502,7 +519,22 @@ pub async fn propose_block(
                 }
 
                 if let Some(to) = users_store.get_mut(target) {
-                    to.balance += transaction.amount;
+                    to.balance += transaction.amount + 1;
+                }
+
+                // if the receiver is a bot, they will reciprocate
+                if users_store.get(target).unwrap().is_bot {
+                    let transaction_id =
+                        calculate_transaction_id(&transaction.target, &transaction.source);
+                    pending_transactions.insert(
+                        transaction_id,
+                        Transaction {
+                            source: target.to_owned(),
+                            target: source.to_owned(),
+                            amount: transaction.amount,
+                            timestamp: Utc::now().naive_local(),
+                        },
+                    );
                 }
             }
         }
@@ -557,12 +589,12 @@ pub async fn propose_transaction(
     let users_store = db.users.read();
 
     // Is this transaction from an authorized source?
-    let internal_user = match users_store.get(&new_transaction.by) {
+    let internal_user = match users_store.get(&new_transaction.source) {
         Some(existing_user) => existing_user,
         None => {
             debug!(
                 "User with public key signature {:?} is not found in the database",
-                new_transaction.by
+                new_transaction.source
             );
 
             return Ok(warp::reply::with_status(
@@ -578,11 +610,41 @@ pub async fn propose_transaction(
 
     // `internal_user` is an authenticated student, can propose
 
-    // Does this user have a pending transaction?
+    // This public key was already written to the database, we can panic if it's not valid at
+    // *this* point
+    let proposer_public_key = &internal_user.public_key;
+
+    let token_payload = match authorize_proposer(token, &proposer_public_key) {
+        Ok(data) => data,
+        Err(below) => {
+            debug!("JWT Error: {:?}", below);
+            return Ok(warp::reply::with_status(
+                warp::reply::json(&GradeCoinResponse {
+                    res: ResponseType::Error,
+                    message: below,
+                }),
+                StatusCode::BAD_REQUEST,
+            ));
+        }
+    };
+
+    let transaction_id = calculate_transaction_id(&new_transaction.source, &new_transaction.target);
+
+    // OLD: Does this user have a pending transaction?
+    // NEW: Is this source:target pair unqiue?
     {
         let transactions = db.pending_transactions.read();
-        if transactions.contains_key(&*new_transaction.by.to_owned()) {
-            debug!("{:?} already has a pending transaction", new_transaction.by);
+        debug!(
+            "This is a transaction from {} to {}",
+            new_transaction.source, new_transaction.target,
+        );
+
+        if transactions.contains_key(&transaction_id) {
+            debug!(
+                "this source/target combination {} already has a pending transaction",
+                transaction_id
+            );
+
             return Ok(warp::reply::with_status(
                 warp::reply::json(&GradeCoinResponse {
                     res: ResponseType::Error,
@@ -593,6 +655,18 @@ pub async fn propose_transaction(
         }
     }
 
+    if new_transaction.source == new_transaction.target {
+        debug!("transaction source and target are the same",);
+
+        return Ok(warp::reply::with_status(
+            warp::reply::json(&GradeCoinResponse {
+                res: ResponseType::Error,
+                message: "transaction to yourself, you had to try didn't you? :)".to_owned(),
+            }),
+            StatusCode::BAD_REQUEST,
+        ));
+    }
+
     // Is transaction amount within bounds
     if new_transaction.amount > TX_UPPER_LIMIT {
         debug!(
@@ -608,76 +682,22 @@ pub async fn propose_transaction(
         ));
     }
 
-    if new_transaction.by == new_transaction.source {
-        // check if user can afford the transaction
-        if internal_user.balance < new_transaction.amount {
-            debug!(
-                "User does not have enough balance ({}) for this TX {}",
-                internal_user.balance, new_transaction.amount
-            );
-            return Ok(warp::reply::with_status(
-                warp::reply::json(&GradeCoinResponse {
-                    res: ResponseType::Error,
-                    message:
-                        "User does not have enough balance in their account for this transaction"
-                            .to_owned(),
-                }),
-                StatusCode::BAD_REQUEST,
-            ));
-        }
-    } else if new_transaction.by == new_transaction.target {
-        // Only transactions FROM bank could appear here
-
-        if new_transaction.source
-            != "31415926535897932384626433832795028841971693993751058209749445923"
-        {
-            debug!(
-                "Extortion attempt - between {} and {}",
-                new_transaction.source, new_transaction.target
-            );
-            return Ok(warp::reply::with_status(
-                warp::reply::json(&GradeCoinResponse {
-                    res: ResponseType::Error,
-                    message: "Transactions cannot extort Gradecoin from unsuspecting users"
-                        .to_owned(),
-                }),
-                StatusCode::BAD_REQUEST,
-            ));
-        }
-    } else {
+    // check if user can afford the transaction
+    if internal_user.balance < new_transaction.amount {
         debug!(
-            "Attempt to transact between two unrelated parties - {} and {}",
-            new_transaction.source, new_transaction.target
+            "User does not have enough balance ({}) for this TX {}",
+            internal_user.balance, new_transaction.amount
         );
         return Ok(warp::reply::with_status(
             warp::reply::json(&GradeCoinResponse {
                 res: ResponseType::Error,
-                message: "Transactions cannot be proposed on behalf of  someone else".to_owned(),
+                message: "User does not have enough balance in their account for this transaction"
+                    .to_owned(),
             }),
             StatusCode::BAD_REQUEST,
         ));
     }
 
-    // This public key was already written to the database, we can panic if it's not valid at
-    // *this* point
-    let proposer_public_key = &internal_user.public_key;
-
-    let token_payload = match authorize_proposer(token, &proposer_public_key) {
-        Ok(data) => data,
-        Err(below) => {
-            debug!("Something went wrong at JWT {:?}", below);
-            return Ok(warp::reply::with_status(
-                warp::reply::json(&GradeCoinResponse {
-                    res: ResponseType::Error,
-                    message: below,
-                }),
-                StatusCode::BAD_REQUEST,
-            ));
-        }
-    };
-
-    // authorized for transaction proposal
-
     // this transaction was already checked for correctness at custom_filters, we can panic here if
     // it has been changed since
 
@@ -701,7 +721,7 @@ pub async fn propose_transaction(
 
     let mut transactions = db.pending_transactions.write();
 
-    transactions.insert(new_transaction.by.to_owned(), new_transaction);
+    transactions.insert(transaction_id, new_transaction);
 
     Ok(warp::reply::with_status(
         warp::reply::json(&GradeCoinResponse {
@@ -772,6 +792,12 @@ fn authorize_proposer(jwt_token: String, user_pem: &str) -> Result<TokenData<Cla
     Ok(token_payload)
 }
 
+fn calculate_transaction_id(source: &str, target: &str) -> String {
+    let long_fingerprint = format!("{}{}", source, target);
+    let id = format!("{:x}", Sha256::digest(long_fingerprint.as_bytes()));
+    id
+}
+
 #[derive(Template)]
 #[template(path = "list.html")]
 struct UserTemplate<'a> {
@@ -781,6 +807,7 @@ struct UserTemplate<'a> {
 struct DisplayUsers {
     fingerprint: String,
     balance: u16,
+    is_bot: bool,
 }
 
 pub async fn user_list_handler(db: Db) -> Result<impl warp::Reply, warp::Rejection> {
@@ -791,6 +818,7 @@ pub async fn user_list_handler(db: Db) -> Result<impl warp::Reply, warp::Rejecti
         sane_users.push(DisplayUsers {
             fingerprint: fingerprint.to_owned(),
             balance: user.balance,
+            is_bot: user.is_bot,
         });
     }
 
diff --git a/templates/css.html b/templates/css.html
index a918a4b..4a2ac7b 100644
--- a/templates/css.html
+++ b/templates/css.html
@@ -1,23 +1,30 @@
 <style>
+
+body {
+    font-family: monospace, Times, serif;
+    margin: 2em auto;
+    max-width: 800px;
+}
+
 table, th, td {
     border: 1px solid black;
     border-collapse: collapse;
 }
 th, td {
-    padding: 15px;
+    padding: 10px;
 }
 #t01 {
-  width: 100%;
-  background-color: #fbf1c7;
+    width: 100%;
+    background-color: #fbf1c7;
 }
 #t01 tr:nth-child(even) {
-  background-color: #a89984;
+    background-color: #a89984;
 }
 #t01 tr:nth-child(odd) {
-  background-color: #f9f5d7;
+    background-color: #f9f5d7;
 }
 #t01 th {
-  color: #fbf1c7;
-  background-color: #282828;
+    color: #fbf1c7;
+    background-color: #282828;
 }
 </style>
diff --git a/templates/header.html b/templates/header.html
index a142fad..1c9136e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,10 +1,11 @@
 <html>
     <head>
-        <title>Gradecoin</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Gradecoin | Users</title>
         {% include "css.html" %}
     </head>
     <body>
-    <div>
-        <h1>Registered Users</h1>
-    </div>
-    <hr />
+        <div>
+            <h1>Registered Users</h1>
+        </div>
+        <hr />
diff --git a/templates/list.html b/templates/list.html
index 083e0e8..0f19107 100644
--- a/templates/list.html
+++ b/templates/list.html
@@ -7,9 +7,9 @@
     </tr>
     {% for user in users %}
     <tr>
-        <td>{{ user.fingerprint }}</td>
+        <td>{{ user.fingerprint }} {% if user.is_bot %} <span title="I'm a bot!">👋🤖</span> {% endif %}</td>
         <td>{{ user.balance }}</td>
     </tr>
-        {% endfor %}
+    {% endfor %}
 </table>
 {% include "footer.html" %}
diff --git a/tests/route_tests.rs b/tests/route_tests.rs
index decc712..cfa1af6 100644
--- a/tests/route_tests.rs
+++ b/tests/route_tests.rs
@@ -24,6 +24,7 @@ FQIDAQAB
 -----END PUBLIC KEY-----"
                     .to_owned(),
                 balance: 30,
+                is_bot: false
             },
         );
 
@@ -33,6 +34,7 @@ FQIDAQAB
                 user_id: MetuId::new("e223715".to_owned(), "1H5QuOYI1b2r9ET".to_owned()).unwrap(),
                 public_key: "NOT_USED_FOR_THIS_USER".to_owned(),
                 balance: 0,
+                is_bot: false
             },
         );
 
@@ -69,8 +71,7 @@ MRArEl4y68+jZLRu74TVG0lXi6ht6KhNHF6GiWKU9FHZ4B+btLicsg==
         db.pending_transactions.write().insert(
             "fingerprint_of_foo".to_owned(),
             Transaction {
-                by: "fingerprint_of_foo".to_owned(),
-                source: "31415926535897932384626433832795028841971693993751058209749445923"
+                source: "fingerprint_of_foo"
                     .to_owned(),
                 target: "fingerprint_of_foo".to_owned(),
                 amount: 2,
@@ -167,9 +168,8 @@ MRArEl4y68+jZLRu74TVG0lXi6ht6KhNHF6GiWKU9FHZ4B+btLicsg==
         let res = warp::test::request()
             .method("POST")
             .json(&Transaction {
-            by: "fingerprint_of_some_guy".to_owned(),
-            source: "31415926535897932384626433832795028841971693993751058209749445923".to_owned(),
-            target: "fingerprint_of_some_guy".to_owned(),
+            source: "fingerprint_of_some_guy".to_owned(),
+            target: "31415926535897932384626433832795028841971693993751058209749445923".to_owned(),
             amount: 2,
             timestamp: chrono::NaiveDate::from_ymd(2021, 04, 13).and_hms(20, 55, 30),
         })
@@ -200,7 +200,6 @@ MRArEl4y68+jZLRu74TVG0lXi6ht6KhNHF6GiWKU9FHZ4B+btLicsg==
         let res = warp::test::request()
             .method("POST")
             .json(&Transaction {
-                by: "some_fingerprint".to_owned(),
                 source: "some_fingerprint".to_owned(),
                 target: "some_other_fingerprint".to_owned(),
                 amount: 2,
@@ -232,10 +231,9 @@ MRArEl4y68+jZLRu74TVG0lXi6ht6KhNHF6GiWKU9FHZ4B+btLicsg==
         db.pending_transactions.write().insert(
             "fingerprint_of_some_guy".to_owned(),
             Transaction {
-                by: "fingerprint_of_some_guy".to_owned(),
-                source: "31415926535897932384626433832795028841971693993751058209749445923"
+                source: "fingerprint_of_some_guy"
                     .to_owned(),
-                target: "fingerprint_of_some_guy".to_owned(),
+                target: "31415926535897932384626433832795028841971693993751058209749445923".to_owned(),
                 amount: 2,
                 timestamp: chrono::NaiveDate::from_ymd(2021, 04, 13).and_hms(20, 55, 30),
             },
diff --git a/tests/schema_tests.rs b/tests/schema_tests.rs
index 4240a5f..072cb2b 100644
--- a/tests/schema_tests.rs
+++ b/tests/schema_tests.rs
@@ -1,310 +1,310 @@
-#[cfg(test)]
-mod tests {
-    use gradecoin::schema::*;
-    use serde_test::{assert_tokens, Token};
-    use chrono::NaiveDate;
-
-    #[test]
-    fn claims_serialize_correctly() {
-        let claims = Claims {
-            tha: "hashed_string".to_owned(),
-            iat: 0,
-            exp: 100,
-        };
-        assert_tokens(
-            &claims,
-            &[
-                Token::Struct{name: "Claims", len: 3},
-                Token::String("tha"),
-                Token::String("hashed_string"),
-                Token::String("iat"),
-                Token::U64(0),
-                Token::String("exp"),
-                Token::U64(100),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn claims_deserialize_correctly() {
-        let data = r#"{"tha":"hashed_string","iat":0,"exp":100}"#;
-        let claims: Claims = serde_json::from_str(data).unwrap();
-        let expected_claims = Claims {
-            tha: "hashed_string".to_owned(),
-            iat: 0,
-            exp: 100,
-        };
-        assert_eq!(claims, expected_claims);
-    }
-
-    #[test]
-    fn transaction_serialize_correctly() {
-        let transaction = Transaction {
-            by: "source".to_owned(),
-            source: "source".to_owned(),
-            target: "target".to_owned(),
-            amount: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-        };
-
-        assert_tokens(
-            &transaction,
-            &[
-                Token::Struct{name: "Transaction", len: 5},
-                Token::String("by"),
-                Token::String("source"),
-                Token::String("source"),
-                Token::String("source"),
-                Token::String("target"),
-                Token::String("target"),
-                Token::String("amount"),
-                Token::I32(0),
-                Token::String("timestamp"),
-                Token::String("2021-04-02T04:02:42"),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn transaction_deserialize_correctly() {
-        let data = r#"{"by":"source","source":"source","target":"target","amount":0,"timestamp":"2021-04-02T04:02:42"}"#;
-        let transaction: Transaction = serde_json::from_str(data).unwrap();
-        let expected_transaction = Transaction {
-            by: "source".to_owned(),
-            source: "source".to_owned(),
-            target: "target".to_owned(),
-            amount: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-        };
-
-        assert_eq!(transaction, expected_transaction);
-    }
-
-    #[test]
-    fn block_serialize_correctly() {
-        let block = Block {
-            transaction_list: vec!["transaction1".to_owned()],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-            hash: "hash".to_owned()
-        };
-
-        assert_tokens(
-            &block,
-            &[
-                Token::Struct{name: "Block", len: 4},
-                Token::String("transaction_list"),
-                Token::Seq {len: Some(1)},
-                Token::String("transaction1"),
-                Token::SeqEnd,
-                Token::String("nonce"),
-                Token::U32(0),
-                Token::String("timestamp"),
-                Token::String("2021-04-02T04:02:42"),
-                Token::String("hash"),
-                Token::String("hash"),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn block_deserialize_correctly() {
-        let expected_block = Block {
-            transaction_list: vec!["transaction1".to_owned()],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-            hash: "hash".to_owned()
-        };
-        let data = r#"{"transaction_list":["transaction1"],"nonce":0,"timestamp":"2021-04-02T04:02:42","hash":"hash"}"#;
-        let block: Block = serde_json::from_str(data).unwrap();
-
-        assert_eq!(block, expected_block);
-
-    }
-
-    #[test]
-    fn block_serialize_when_vec_emptpy() {
-        let block = Block {
-            transaction_list: vec![],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-            hash: "hash".to_owned()
-        };
-
-        let json = serde_json::to_string(&block).unwrap();
-        assert_eq!(json, r#"{"nonce":0,"timestamp":"2021-04-02T04:02:42","hash":"hash"}"#)
-    }
-
-    #[test]
-    fn naked_block_serialize_correctly() {
-        let naked_block = NakedBlock {
-            transaction_list: vec!["transaction1".to_owned()],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-        };
-
-        assert_tokens(
-            &naked_block,
-            &[
-                Token::Struct{name: "NakedBlock", len: 3},
-                Token::String("transaction_list"),
-                Token::Seq {len: Some(1)},
-                Token::String("transaction1"),
-                Token::SeqEnd,
-                Token::String("nonce"),
-                Token::U32(0),
-                Token::String("timestamp"),
-                Token::String("2021-04-02T04:02:42"),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn naked_block_deserialize_correctly() {
-        let expected_naked_block = NakedBlock {
-            transaction_list: vec!["transaction1".to_owned()],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-        };
-        let data = r#"{"transaction_list":["transaction1"],"nonce":0,"timestamp":"2021-04-02T04:02:42"}"#;
-        let naked_block: NakedBlock = serde_json::from_str(data).unwrap();
-
-        assert_eq!(naked_block, expected_naked_block);
-
-    }
-
-    #[test]
-    fn naked_block_serialize_when_vec_emptpy() {
-        let naked_block = NakedBlock {
-            transaction_list: vec![],
-            nonce: 0,
-            timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
-        };
-
-        let json = serde_json::to_string(&naked_block).unwrap();
-        assert_eq!(json, r#"{"nonce":0,"timestamp":"2021-04-02T04:02:42"}"#)
-    }
-
-    #[test]
-    fn user_serialize_correctly() {
-        let user = User {
-            user_id: MetuId::new("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap(),
-            public_key: "public_key".to_owned(),
-            balance: 0
-        };
-
-        assert_tokens(
-            &user,
-            &[
-                Token::Struct{name: "User", len: 3},
-                Token::String("user_id"),
-                Token::Struct {name: "MetuId", len: 2},
-                Token::String("id"),
-                Token::String("e254275"),
-                Token::String("passwd"),
-                Token::String("DtNX1qk4YF4saRH"),
-                Token::StructEnd,
-                Token::String("public_key"),
-                Token::String("public_key"),
-                Token::String("balance"),
-                Token::I32(0),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn user_deserialize_correctly() {
-        let expected_user = User {
-            user_id: MetuId::new("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap(),
-            public_key: "public_key".to_owned(),
-            balance: 0
-        };
-        let data = r#"{"user_id":{"id":"e254275","passwd":"DtNX1qk4YF4saRH"},"public_key":"public_key","balance":0}"#;
-        let user: User = serde_json::from_str(data).unwrap();
-
-        assert_eq!(user, expected_user);
-
-    }
-
-    #[test]
-    fn metu_id_serialize_correctly() {
-        let metu_id = MetuId::new ("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap();
-
-        assert_tokens(
-            &metu_id,
-            &[
-                Token::Struct{name: "MetuId", len: 2},
-                Token::String("id"),
-                Token::String("e254275"),
-                Token::String("passwd"),
-                Token::String("DtNX1qk4YF4saRH"),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn metu_id_deserialize_correctly() {
-        let expected_metu_id = MetuId::new ("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap();
-        let data = r#"{"id":"e254275","passwd":"DtNX1qk4YF4saRH"}"#;
-        let metu_id: MetuId = serde_json::from_str(data).unwrap();
-
-        assert_eq!(metu_id, expected_metu_id);
-    }
-
-    #[test]
-    fn auth_request_serialize_correctly() {
-        let auth_request = AuthRequest {
-            student_id: "e254275".to_owned(),
-            passwd: "DtNX1qk4YF4saRH".to_owned(),
-            public_key: "public_key".to_owned()
-        };
-
-        assert_tokens(
-            &auth_request,
-            &[
-                Token::Struct{name: "AuthRequest", len: 3},
-                Token::String("student_id"),
-                Token::String("e254275"),
-                Token::String("passwd"),
-                Token::String("DtNX1qk4YF4saRH"),
-                Token::String("public_key"),
-                Token::String("public_key"),
-                Token::StructEnd,
-            ]
-        )
-    }
-
-    #[test]
-    fn auth_request_deserialize_correctly() {
-        let expected_auth_request = AuthRequest {
-            student_id: "e254275".to_owned(),
-            passwd: "DtNX1qk4YF4saRH".to_owned(),
-            public_key: "public_key".to_owned()
-        };
-        let data = r#"{"student_id":"e254275","passwd":"DtNX1qk4YF4saRH","public_key":"public_key"}"#;
-        let auth_request: AuthRequest = serde_json::from_str(data).unwrap();
-
-        assert_eq!(auth_request, expected_auth_request);
-
-    }
-
-
-
-
-
-
-
-
+// #[cfg(test)]
+// mod tests {
+//     use gradecoin::schema::*;
+//     use serde_test::{assert_tokens, Token};
+//     use chrono::NaiveDate;
+
+//     #[test]
+//     fn claims_serialize_correctly() {
+//         let claims = Claims {
+//             tha: "hashed_string".to_owned(),
+//             iat: 0,
+//             exp: 100,
+//         };
+//         assert_tokens(
+//             &claims,
+//             &[
+//                 Token::Struct{name: "Claims", len: 3},
+//                 Token::String("tha"),
+//                 Token::String("hashed_string"),
+//                 Token::String("iat"),
+//                 Token::U64(0),
+//                 Token::String("exp"),
+//                 Token::U64(100),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn claims_deserialize_correctly() {
+//         let data = r#"{"tha":"hashed_string","iat":0,"exp":100}"#;
+//         let claims: Claims = serde_json::from_str(data).unwrap();
+//         let expected_claims = Claims {
+//             tha: "hashed_string".to_owned(),
+//             iat: 0,
+//             exp: 100,
+//         };
+//         assert_eq!(claims, expected_claims);
+//     }
+
+//     #[test]
+//     fn transaction_serialize_correctly() {
+//         let transaction = Transaction {
+//             by: "source".to_owned(),
+//             source: "source".to_owned(),
+//             target: "target".to_owned(),
+//             amount: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//         };
+
+//         assert_tokens(
+//             &transaction,
+//             &[
+//                 Token::Struct{name: "Transaction", len: 5},
+//                 Token::String("by"),
+//                 Token::String("source"),
+//                 Token::String("source"),
+//                 Token::String("source"),
+//                 Token::String("target"),
+//                 Token::String("target"),
+//                 Token::String("amount"),
+//                 Token::I32(0),
+//                 Token::String("timestamp"),
+//                 Token::String("2021-04-02T04:02:42"),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn transaction_deserialize_correctly() {
+//         let data = r#"{"by":"source","source":"source","target":"target","amount":0,"timestamp":"2021-04-02T04:02:42"}"#;
+//         let transaction: Transaction = serde_json::from_str(data).unwrap();
+//         let expected_transaction = Transaction {
+//             by: "source".to_owned(),
+//             source: "source".to_owned(),
+//             target: "target".to_owned(),
+//             amount: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//         };
+
+//         assert_eq!(transaction, expected_transaction);
+//     }
+
+//     #[test]
+//     fn block_serialize_correctly() {
+//         let block = Block {
+//             transaction_list: vec!["transaction1".to_owned()],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//             hash: "hash".to_owned()
+//         };
+
+//         assert_tokens(
+//             &block,
+//             &[
+//                 Token::Struct{name: "Block", len: 4},
+//                 Token::String("transaction_list"),
+//                 Token::Seq {len: Some(1)},
+//                 Token::String("transaction1"),
+//                 Token::SeqEnd,
+//                 Token::String("nonce"),
+//                 Token::U32(0),
+//                 Token::String("timestamp"),
+//                 Token::String("2021-04-02T04:02:42"),
+//                 Token::String("hash"),
+//                 Token::String("hash"),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn block_deserialize_correctly() {
+//         let expected_block = Block {
+//             transaction_list: vec!["transaction1".to_owned()],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//             hash: "hash".to_owned()
+//         };
+//         let data = r#"{"transaction_list":["transaction1"],"nonce":0,"timestamp":"2021-04-02T04:02:42","hash":"hash"}"#;
+//         let block: Block = serde_json::from_str(data).unwrap();
+
+//         assert_eq!(block, expected_block);
+
+//     }
+
+//     #[test]
+//     fn block_serialize_when_vec_emptpy() {
+//         let block = Block {
+//             transaction_list: vec![],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//             hash: "hash".to_owned()
+//         };
+
+//         let json = serde_json::to_string(&block).unwrap();
+//         assert_eq!(json, r#"{"nonce":0,"timestamp":"2021-04-02T04:02:42","hash":"hash"}"#)
+//     }
+
+//     #[test]
+//     fn naked_block_serialize_correctly() {
+//         let naked_block = NakedBlock {
+//             transaction_list: vec!["transaction1".to_owned()],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//         };
+
+//         assert_tokens(
+//             &naked_block,
+//             &[
+//                 Token::Struct{name: "NakedBlock", len: 3},
+//                 Token::String("transaction_list"),
+//                 Token::Seq {len: Some(1)},
+//                 Token::String("transaction1"),
+//                 Token::SeqEnd,
+//                 Token::String("nonce"),
+//                 Token::U32(0),
+//                 Token::String("timestamp"),
+//                 Token::String("2021-04-02T04:02:42"),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn naked_block_deserialize_correctly() {
+//         let expected_naked_block = NakedBlock {
+//             transaction_list: vec!["transaction1".to_owned()],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//         };
+//         let data = r#"{"transaction_list":["transaction1"],"nonce":0,"timestamp":"2021-04-02T04:02:42"}"#;
+//         let naked_block: NakedBlock = serde_json::from_str(data).unwrap();
+
+//         assert_eq!(naked_block, expected_naked_block);
+
+//     }
+
+//     #[test]
+//     fn naked_block_serialize_when_vec_emptpy() {
+//         let naked_block = NakedBlock {
+//             transaction_list: vec![],
+//             nonce: 0,
+//             timestamp: NaiveDate::from_ymd(2021, 4, 2).and_hms(4, 2, 42),
+//         };
+
+//         let json = serde_json::to_string(&naked_block).unwrap();
+//         assert_eq!(json, r#"{"nonce":0,"timestamp":"2021-04-02T04:02:42"}"#)
+//     }
+
+//     #[test]
+//     fn user_serialize_correctly() {
+//         let user = User {
+//             user_id: MetuId::new("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap(),
+//             public_key: "public_key".to_owned(),
+//             balance: 0
+//         };
+
+//         assert_tokens(
+//             &user,
+//             &[
+//                 Token::Struct{name: "User", len: 3},
+//                 Token::String("user_id"),
+//                 Token::Struct {name: "MetuId", len: 2},
+//                 Token::String("id"),
+//                 Token::String("e254275"),
+//                 Token::String("passwd"),
+//                 Token::String("DtNX1qk4YF4saRH"),
+//                 Token::StructEnd,
+//                 Token::String("public_key"),
+//                 Token::String("public_key"),
+//                 Token::String("balance"),
+//                 Token::I32(0),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn user_deserialize_correctly() {
+//         let expected_user = User {
+//             user_id: MetuId::new("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap(),
+//             public_key: "public_key".to_owned(),
+//             balance: 0
+//         };
+//         let data = r#"{"user_id":{"id":"e254275","passwd":"DtNX1qk4YF4saRH"},"public_key":"public_key","balance":0}"#;
+//         let user: User = serde_json::from_str(data).unwrap();
+
+//         assert_eq!(user, expected_user);
+
+//     }
+
+//     #[test]
+//     fn metu_id_serialize_correctly() {
+//         let metu_id = MetuId::new ("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap();
+
+//         assert_tokens(
+//             &metu_id,
+//             &[
+//                 Token::Struct{name: "MetuId", len: 2},
+//                 Token::String("id"),
+//                 Token::String("e254275"),
+//                 Token::String("passwd"),
+//                 Token::String("DtNX1qk4YF4saRH"),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn metu_id_deserialize_correctly() {
+//         let expected_metu_id = MetuId::new ("e254275".to_owned(), "DtNX1qk4YF4saRH".to_owned()).unwrap();
+//         let data = r#"{"id":"e254275","passwd":"DtNX1qk4YF4saRH"}"#;
+//         let metu_id: MetuId = serde_json::from_str(data).unwrap();
+
+//         assert_eq!(metu_id, expected_metu_id);
+//     }
+
+//     #[test]
+//     fn auth_request_serialize_correctly() {
+//         let auth_request = AuthRequest {
+//             student_id: "e254275".to_owned(),
+//             passwd: "DtNX1qk4YF4saRH".to_owned(),
+//             public_key: "public_key".to_owned()
+//         };
+
+//         assert_tokens(
+//             &auth_request,
+//             &[
+//                 Token::Struct{name: "AuthRequest", len: 3},
+//                 Token::String("student_id"),
+//                 Token::String("e254275"),
+//                 Token::String("passwd"),
+//                 Token::String("DtNX1qk4YF4saRH"),
+//                 Token::String("public_key"),
+//                 Token::String("public_key"),
+//                 Token::StructEnd,
+//             ]
+//         )
+//     }
+
+//     #[test]
+//     fn auth_request_deserialize_correctly() {
+//         let expected_auth_request = AuthRequest {
+//             student_id: "e254275".to_owned(),
+//             passwd: "DtNX1qk4YF4saRH".to_owned(),
+//             public_key: "public_key".to_owned()
+//         };
+//         let data = r#"{"student_id":"e254275","passwd":"DtNX1qk4YF4saRH","public_key":"public_key"}"#;
+//         let auth_request: AuthRequest = serde_json::from_str(data).unwrap();
+
+//         assert_eq!(auth_request, expected_auth_request);
+
+//     }
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-}
\ No newline at end of file
+// }