diff options
author | alpaylan | 2021-04-16 15:12:29 +0300 |
---|---|---|
committer | alpaylan | 2021-04-16 15:12:29 +0300 |
commit | db807f1211870eb7ed48a2ad8b86f995734cfc0c (patch) | |
tree | ed8019d52cc2f2a490c723c8a8e32c9528f77d62 | |
parent | 818b532230a9ffcb4d2b1705adbb7e9dd9b12457 (diff) | |
parent | 1caa33e1772bf9e379e9e8a489b5d5d641107017 (diff) | |
download | gradecoin-db807f1211870eb7ed48a2ad8b86f995734cfc0c.tar.gz gradecoin-db807f1211870eb7ed48a2ad8b86f995734cfc0c.tar.bz2 gradecoin-db807f1211870eb7ed48a2ad8b86f995734cfc0c.zip |
Merge remote-tracking branch 'origin/main'
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | tests/route_tests.rs | 22 |
2 files changed, 2 insertions, 22 deletions
@@ -1,6 +1,6 @@ | |||
1 | [package] | 1 | [package] |
2 | name = "gradecoin" | 2 | name = "gradecoin" |
3 | version = "0.1.0" | 3 | version = "0.2.0" |
4 | authors = ["Yigit Sever <yigit@ceng.metu.edu.tr>"] | 4 | authors = ["Yigit Sever <yigit@ceng.metu.edu.tr>"] |
5 | edition = "2018" | 5 | edition = "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)] |
2 | mod tests { | 2 | mod 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 { |