aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralpaylan2021-04-16 15:12:29 +0300
committeralpaylan2021-04-16 15:12:29 +0300
commitea12fb6a65813339afbbe674605ac101e1f34ed7 (patch)
tree0d6ed5719d15af7fe5c91aecc7e2e0ec2f5604f6
parentcb6bbf20054ae2d4f26c0eb5aaa301a9fc3c83b2 (diff)
parent6e248a4d3cecab3953fd6223aaf246e09bbd2d5d (diff)
downloadgradecoin-ea12fb6a65813339afbbe674605ac101e1f34ed7.tar.gz
gradecoin-ea12fb6a65813339afbbe674605ac101e1f34ed7.tar.bz2
gradecoin-ea12fb6a65813339afbbe674605ac101e1f34ed7.zip
Merge remote-tracking branch 'origin/main'
-rw-r--r--Cargo.toml2
-rw-r--r--tests/route_tests.rs22
2 files changed, 2 insertions, 22 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 9c1d5f1..f85fde3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
1[package] 1[package]
2name = "gradecoin" 2name = "gradecoin"
3version = "0.1.0" 3version = "0.2.0"
4authors = ["Yigit Sever <yigit@ceng.metu.edu.tr>"] 4authors = ["Yigit Sever <yigit@ceng.metu.edu.tr>"]
5edition = "2018" 5edition = "2018"
6 6
diff --git a/tests/route_tests.rs b/tests/route_tests.rs
index f3fbb0e..3d8b7f4 100644
--- a/tests/route_tests.rs
+++ b/tests/route_tests.rs
@@ -1,8 +1,6 @@
1#[cfg(test)] 1#[cfg(test)]
2mod tests { 2mod tests {
3 use gradecoin::schema::{ 3 use gradecoin::schema::{Block, Db, InitialAuthRequest, MetuId, Transaction, User};
4 create_database, AuthRequest, Block, Db, InitialAuthRequest, MetuId, Transaction, User,
5 };
6 4
7 use gradecoin::routes::consensus_routes; 5 use gradecoin::routes::consensus_routes;
8 use warp::http::StatusCode; 6 use warp::http::StatusCode;
@@ -101,24 +99,6 @@ FQIDAQAB
101 db 99 db
102 } 100 }
103 101
104 // /// Create a mock user that is allowed to be in gradecoin to be used in tests
105 // fn priviliged_mocked_user() -> AuthRequest {
106 // AuthRequest {
107 // student_id: String::from("e254275"),
108 // passwd: String::from("DtNX1qk4YF4saRH"),
109 // public_key: "NOT IMPLEMENTED".to_owned(),
110 // }
111 // }
112
113 // /// Create a mock user that is NOT allowed to be in gradecoin to be used in tests
114 // fn unpriviliged_mocked_user() -> AuthRequest {
115 // AuthRequest {
116 // student_id: String::from("foobarbaz"),
117 // passwd: String::from("DtNX1qk4YF4saRH"),
118 // public_key: "NOT IMPLEMENTED".to_owned(),
119 // }
120 // }
121
122 /// Create a mock transaction to be used in tests 102 /// Create a mock transaction to be used in tests
123 fn mocked_transaction() -> Transaction { 103 fn mocked_transaction() -> Transaction {
124 Transaction { 104 Transaction {