From debc755d949616b6e21daf8946f6002fa1be8570 Mon Sep 17 00:00:00 2001
From: Yigit Sever
Date: Tue, 20 Apr 2021 12:21:50 +0300
Subject: Change block proposal, fix tests

---
 src/handlers.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/handlers.rs')

diff --git a/src/handlers.rs b/src/handlers.rs
index 6305560..bf554ab 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -18,7 +18,7 @@ use std::fs;
 use warp::{http::StatusCode, reply};
 
 use crate::PRIVATE_KEY;
-const BLOCK_TRANSACTION_COUNT: u8 = 5;
+const BLOCK_TRANSACTION_COUNT: u8 = 1;
 const BLOCK_REWARD: u16 = 3;
 const TX_UPPER_LIMIT: u16 = 2;
 
@@ -181,7 +181,7 @@ pub async fn authenticate_user(
     let auth_plaintext = match cipher.decrypt(&mut buf) {
         Ok(p) => p,
         Err(err) => {
-            println!(
+            debug!(
                 "Base64 decoded auth request did not decrypt correctly {:?} {}",
                 &auth_packet, err
             );
@@ -342,11 +342,12 @@ pub async fn propose_block(
 
     warn!("New block proposal: {:?}", &new_block);
 
-    if new_block.transaction_list.len() != BLOCK_TRANSACTION_COUNT as usize {
+    if new_block.transaction_list.len() < BLOCK_TRANSACTION_COUNT as usize {
+        debug!("{} transactions offered, needed {}", new_block.transaction_list.len(), BLOCK_TRANSACTION_COUNT);
         let res_json = warp::reply::json(&GradeCoinResponse {
             res: ResponseType::Error,
             message: format!(
-                "There should be {} transactions in the block",
+                "There should be at least {} transaction in the block",
                 BLOCK_TRANSACTION_COUNT
             ),
         });
@@ -411,11 +412,11 @@ pub async fn propose_block(
             proposed_transactions.insert(tx);
         }
 
-        if proposed_transactions.len() != BLOCK_TRANSACTION_COUNT as usize {
+        if proposed_transactions.len() < BLOCK_TRANSACTION_COUNT as usize {
             let res_json = warp::reply::json(&GradeCoinResponse {
                 res: ResponseType::Error,
                 message: format!(
-                    "Block cannot contain less than {} unique transactions.",
+                    "Block cannot contain less than {} unique transaction(s).",
                     BLOCK_TRANSACTION_COUNT
                 ),
             });
-- 
cgit v1.2.3-70-g09d2