db helper and fix test never timing out
This commit is contained in:
parent
d613969c3e
commit
865c6d498e
@ -8,6 +8,7 @@ use ethers::{
|
|||||||
utils::{Anvil, AnvilInstance},
|
utils::{Anvil, AnvilInstance},
|
||||||
};
|
};
|
||||||
use hashbrown::HashMap;
|
use hashbrown::HashMap;
|
||||||
|
use migration::sea_orm::DatabaseConnection;
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use std::{
|
use std::{
|
||||||
env,
|
env,
|
||||||
@ -32,6 +33,7 @@ use web3_proxy::{
|
|||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct DbData {
|
pub struct DbData {
|
||||||
|
pub conn: Option<DatabaseConnection>,
|
||||||
pub container_name: String,
|
pub container_name: String,
|
||||||
pub url: Option<String>,
|
pub url: Option<String>,
|
||||||
}
|
}
|
||||||
@ -97,6 +99,7 @@ impl TestApp {
|
|||||||
// create the db_data as soon as the url is known
|
// create the db_data as soon as the url is known
|
||||||
// when this is dropped, the db will be stopped
|
// when this is dropped, the db will be stopped
|
||||||
let mut db_data = DbData {
|
let mut db_data = DbData {
|
||||||
|
conn: None,
|
||||||
container_name: db_container_name.clone(),
|
container_name: db_container_name.clone(),
|
||||||
url: None,
|
url: None,
|
||||||
};
|
};
|
||||||
@ -195,7 +198,7 @@ impl TestApp {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: make sure mysql is actually ready for connections
|
// TODO: make sure mysql is actually ready for connections
|
||||||
sleep(Duration::from_secs(7)).await;
|
sleep(Duration::from_secs(1)).await;
|
||||||
|
|
||||||
info!(%db_url, elapsed=%start.elapsed().as_secs_f32(), "db is ready for connections. Migrating now...");
|
info!(%db_url, elapsed=%start.elapsed().as_secs_f32(), "db is ready for connections. Migrating now...");
|
||||||
|
|
||||||
@ -207,15 +210,18 @@ impl TestApp {
|
|||||||
panic!("db took too long to start");
|
panic!("db took too long to start");
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Err(err) = get_migrated_db(db_url.clone(), 1, 1).await {
|
match get_migrated_db(db_url.clone(), 1, 1).await {
|
||||||
|
Ok(x) => {
|
||||||
|
// it worked! yey!
|
||||||
|
db_data.conn = Some(x);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
// not connected. sleep and then try again
|
// not connected. sleep and then try again
|
||||||
warn!(?err, "unable to migrate db");
|
warn!(?err, "unable to migrate db");
|
||||||
sleep(Duration::from_secs(1)).await;
|
sleep(Duration::from_secs(1)).await;
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// it worked! yey!
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
info!(%db_url, elapsed=%start.elapsed().as_secs_f32(), "db is migrated");
|
info!(%db_url, elapsed=%start.elapsed().as_secs_f32(), "db is migrated");
|
||||||
@ -302,6 +308,11 @@ impl TestApp {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
|
pub fn db_conn(&self) -> &DatabaseConnection {
|
||||||
|
self.db.as_ref().unwrap().conn.as_ref().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn stop(&self) -> Result<usize, SendError<()>> {
|
pub fn stop(&self) -> Result<usize, SendError<()>> {
|
||||||
self.shutdown_sender.send(())
|
self.shutdown_sender.send(())
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
mod common;
|
mod common;
|
||||||
|
|
||||||
|
use std::str::FromStr;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
use crate::common::TestApp;
|
use crate::common::TestApp;
|
||||||
use ethers::abi::AbiEncode;
|
|
||||||
use ethers::prelude::Signer;
|
use ethers::prelude::Signer;
|
||||||
use ethers::types::Signature;
|
use ethers::types::Signature;
|
||||||
use rust_decimal::Decimal;
|
use rust_decimal::Decimal;
|
||||||
use std::str::FromStr;
|
use tracing::info;
|
||||||
use tracing::{debug, info, trace, warn};
|
|
||||||
use web3_proxy::frontend::admin::AdminIncreaseBalancePost;
|
use web3_proxy::frontend::admin::AdminIncreaseBalancePost;
|
||||||
use web3_proxy::frontend::users::authentication::{LoginPostResponse, PostLogin};
|
use web3_proxy::frontend::users::authentication::{LoginPostResponse, PostLogin};
|
||||||
use web3_proxy::relational_db::get_db;
|
|
||||||
use web3_proxy::sub_commands::ChangeAdminStatusSubCommand;
|
use web3_proxy::sub_commands::ChangeAdminStatusSubCommand;
|
||||||
|
|
||||||
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
@ -26,17 +26,19 @@ async fn test_admin_imitate_user() {
|
|||||||
async fn test_admin_grant_credits() {
|
async fn test_admin_grant_credits() {
|
||||||
info!("Starting admin grant credits test");
|
info!("Starting admin grant credits test");
|
||||||
let x = TestApp::spawn(true).await;
|
let x = TestApp::spawn(true).await;
|
||||||
let r = reqwest::Client::new();
|
let r = reqwest::Client::builder()
|
||||||
|
.timeout(Duration::from_secs(3))
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
// Setup variables that will be used
|
// Setup variables that will be used
|
||||||
let login_post_url = format!("{}user/login", x.proxy_provider.url());
|
let login_post_url = format!("{}user/login", x.proxy_provider.url());
|
||||||
let increase_balance_post_url = format!("{}admin/increase_balance", x.proxy_provider.url());
|
let increase_balance_post_url = format!("{}admin/increase_balance", x.proxy_provider.url());
|
||||||
|
|
||||||
// TODO: I should make a wallet an admin wallet first ...
|
|
||||||
let admin_wallet = x.wallet(1);
|
let admin_wallet = x.wallet(1);
|
||||||
let user_wallet = x.wallet(2);
|
let user_wallet = x.wallet(2);
|
||||||
|
|
||||||
// Login the admin
|
// Login the admin to create their account. they aren't an admin yet
|
||||||
let admin_login_get_url = format!(
|
let admin_login_get_url = format!(
|
||||||
"{}user/login/{:?}",
|
"{}user/login/{:?}",
|
||||||
x.proxy_provider.url(),
|
x.proxy_provider.url(),
|
||||||
@ -44,18 +46,21 @@ async fn test_admin_grant_credits() {
|
|||||||
);
|
);
|
||||||
let admin_login_message = r.get(admin_login_get_url).send().await.unwrap();
|
let admin_login_message = r.get(admin_login_get_url).send().await.unwrap();
|
||||||
let admin_login_message = admin_login_message.text().await.unwrap();
|
let admin_login_message = admin_login_message.text().await.unwrap();
|
||||||
|
|
||||||
// Sign the message and POST it to login as admin
|
// Sign the message and POST it to login as admin
|
||||||
let admin_signed: Signature = admin_wallet
|
let admin_signed: Signature = admin_wallet
|
||||||
.sign_message(&admin_login_message)
|
.sign_message(&admin_login_message)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
info!(?admin_signed);
|
info!(?admin_signed);
|
||||||
|
|
||||||
let admin_post_login_data = PostLogin {
|
let admin_post_login_data = PostLogin {
|
||||||
msg: admin_login_message,
|
msg: admin_login_message,
|
||||||
sig: admin_signed.to_string(),
|
sig: admin_signed.to_string(),
|
||||||
referral_code: None,
|
referral_code: None,
|
||||||
};
|
};
|
||||||
info!(?admin_post_login_data);
|
info!(?admin_post_login_data);
|
||||||
|
|
||||||
let admin_login_response = r
|
let admin_login_response = r
|
||||||
.post(&login_post_url)
|
.post(&login_post_url)
|
||||||
.json(&admin_post_login_data)
|
.json(&admin_post_login_data)
|
||||||
@ -76,15 +81,17 @@ async fn test_admin_grant_credits() {
|
|||||||
let user_login_message = r.get(user_login_get_url).send().await.unwrap();
|
let user_login_message = r.get(user_login_get_url).send().await.unwrap();
|
||||||
let user_login_message = user_login_message.text().await.unwrap();
|
let user_login_message = user_login_message.text().await.unwrap();
|
||||||
|
|
||||||
// Sign the message and POST it to login as admin
|
// Sign the message and POST it to login as the user
|
||||||
let user_signed: Signature = user_wallet.sign_message(&user_login_message).await.unwrap();
|
let user_signed: Signature = user_wallet.sign_message(&user_login_message).await.unwrap();
|
||||||
info!(?user_signed);
|
info!(?user_signed);
|
||||||
|
|
||||||
let user_post_login_data = PostLogin {
|
let user_post_login_data = PostLogin {
|
||||||
msg: user_login_message,
|
msg: user_login_message,
|
||||||
sig: user_signed.to_string(),
|
sig: user_signed.to_string(),
|
||||||
referral_code: None,
|
referral_code: None,
|
||||||
};
|
};
|
||||||
info!(?user_post_login_data);
|
info!(?user_post_login_data);
|
||||||
|
|
||||||
let user_login_response = r
|
let user_login_response = r
|
||||||
.post(&login_post_url)
|
.post(&login_post_url)
|
||||||
.json(&user_post_login_data)
|
.json(&user_post_login_data)
|
||||||
@ -102,23 +109,11 @@ async fn test_admin_grant_credits() {
|
|||||||
address: format!("{:?}", admin_wallet.address()),
|
address: format!("{:?}", admin_wallet.address()),
|
||||||
should_be_admin: true,
|
should_be_admin: true,
|
||||||
};
|
};
|
||||||
info!("Admin status changer object is: ");
|
|
||||||
info!(?admin_status_changer);
|
info!(?admin_status_changer);
|
||||||
|
|
||||||
// I suppose I gotta create a new database connection
|
|
||||||
// Connect to the database using the connection getter
|
|
||||||
info!("Establishing the database connection");
|
|
||||||
let db_conn = get_db(
|
|
||||||
x.db.as_ref().unwrap().url.as_ref().unwrap().to_string(),
|
|
||||||
1,
|
|
||||||
1,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
info!("Changing the status of the admin_wallet to be an admin");
|
info!("Changing the status of the admin_wallet to be an admin");
|
||||||
// Pass on the database into it ...
|
// Pass on the database into it ...
|
||||||
let _ = admin_status_changer.main(&db_conn).await.unwrap();
|
admin_status_changer.main(x.db_conn()).await.unwrap();
|
||||||
|
|
||||||
// Login the admin again, because he was just signed out
|
// Login the admin again, because he was just signed out
|
||||||
let admin_login_get_url = format!(
|
let admin_login_get_url = format!(
|
||||||
@ -128,18 +123,21 @@ async fn test_admin_grant_credits() {
|
|||||||
);
|
);
|
||||||
let admin_login_message = r.get(admin_login_get_url).send().await.unwrap();
|
let admin_login_message = r.get(admin_login_get_url).send().await.unwrap();
|
||||||
let admin_login_message = admin_login_message.text().await.unwrap();
|
let admin_login_message = admin_login_message.text().await.unwrap();
|
||||||
|
|
||||||
// Sign the message and POST it to login as admin
|
// Sign the message and POST it to login as admin
|
||||||
let admin_signed: Signature = admin_wallet
|
let admin_signed: Signature = admin_wallet
|
||||||
.sign_message(&admin_login_message)
|
.sign_message(&admin_login_message)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
info!(?admin_signed);
|
info!(?admin_signed);
|
||||||
|
|
||||||
let admin_post_login_data = PostLogin {
|
let admin_post_login_data = PostLogin {
|
||||||
msg: admin_login_message,
|
msg: admin_login_message,
|
||||||
sig: admin_signed.to_string(),
|
sig: admin_signed.to_string(),
|
||||||
referral_code: None,
|
referral_code: None,
|
||||||
};
|
};
|
||||||
info!(?admin_post_login_data);
|
info!(?admin_post_login_data);
|
||||||
|
|
||||||
let admin_login_response = r
|
let admin_login_response = r
|
||||||
.post(&login_post_url)
|
.post(&login_post_url)
|
||||||
.json(&admin_post_login_data)
|
.json(&admin_post_login_data)
|
||||||
@ -151,8 +149,6 @@ async fn test_admin_grant_credits() {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
info!(?admin_login_response);
|
info!(?admin_login_response);
|
||||||
|
|
||||||
// Make the admin user an admin
|
|
||||||
|
|
||||||
info!("Increasing balance");
|
info!("Increasing balance");
|
||||||
// Login the user
|
// Login the user
|
||||||
// Use the bearer token of admin to increase user balance
|
// Use the bearer token of admin to increase user balance
|
||||||
@ -164,6 +160,7 @@ async fn test_admin_grant_credits() {
|
|||||||
info!(?increase_balance_post_url);
|
info!(?increase_balance_post_url);
|
||||||
info!(?increase_balance_data);
|
info!(?increase_balance_data);
|
||||||
info!(?admin_login_response.bearer_token);
|
info!(?admin_login_response.bearer_token);
|
||||||
|
|
||||||
let increase_balance_response = r
|
let increase_balance_response = r
|
||||||
.post(increase_balance_post_url)
|
.post(increase_balance_post_url)
|
||||||
.json(&increase_balance_data)
|
.json(&increase_balance_data)
|
||||||
@ -171,22 +168,23 @@ async fn test_admin_grant_credits() {
|
|||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
info!("Passed second checkpoint");
|
info!("bug is on the line above. it never returns");
|
||||||
info!(?increase_balance_response);
|
info!(?increase_balance_response, "http response");
|
||||||
// let increase_balance_response = increase_balance_response
|
|
||||||
// .json::<serde_json::Value>()
|
|
||||||
// .await
|
|
||||||
// .unwrap();
|
|
||||||
// info!(?increase_balance_response);
|
|
||||||
|
|
||||||
// // Check if the response is as expected
|
let increase_balance_response = increase_balance_response
|
||||||
// // assert_eq!(increase_balance_response["user"], user_wallet.address());
|
.json::<serde_json::Value>()
|
||||||
// assert_eq!(
|
.await
|
||||||
// Decimal::from_str(increase_balance_response["amount"].as_str().unwrap()).unwrap(),
|
.unwrap();
|
||||||
// Decimal::from(100)
|
info!(?increase_balance_response, "json response");
|
||||||
// );
|
|
||||||
//
|
// Check if the response is as expected
|
||||||
// x.wait().await;
|
// TODO: assert_eq!(increase_balance_response["user"], user_wallet.address());
|
||||||
|
assert_eq!(
|
||||||
|
Decimal::from_str(increase_balance_response["amount"].as_str().unwrap()).unwrap(),
|
||||||
|
Decimal::from(100)
|
||||||
|
);
|
||||||
|
|
||||||
|
x.wait().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
|
Loading…
Reference in New Issue
Block a user