tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lint

This commit is contained in:
Bryan Stitt 2023-05-23 14:51:34 -07:00
parent d83e2f7015
commit 651f0fcad3
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web3_proxy/src/frontend/admin.rs
View File

@ -5,11 +5,9 @@ use super::errors::Web3ProxyResponse;
use crate::admin_queries::query_admin_modify_usertier; use crate::admin_queries::query_admin_modify_usertier;
use crate::app::Web3ProxyApp; use crate::app::Web3ProxyApp;
use crate::frontend::errors::{Web3ProxyError, Web3ProxyErrorContext}; use crate::frontend::errors::{Web3ProxyError, Web3ProxyErrorContext};
use crate::http_params::get_user_id_from_params;
use crate::user_token::UserBearerToken; use crate::user_token::UserBearerToken;
use crate::PostLogin; use crate::PostLogin;
use anyhow::Context; use anyhow::Context;
use axum::body::HttpBody;
use axum::{ use axum::{
extract::{Path, Query}, extract::{Path, Query},
headers::{authorization::Bearer, Authorization}, headers::{authorization::Bearer, Authorization},
@ -29,10 +27,9 @@ use http::StatusCode;
use log::{debug, info, warn}; use log::{debug, info, warn};
use migration::sea_orm::prelude::{Decimal, Uuid}; use migration::sea_orm::prelude::{Decimal, Uuid};
use migration::sea_orm::{ use migration::sea_orm::{
self, ActiveModelTrait, ActiveValue, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, self, ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
TransactionTrait, Update,
}; };
use migration::{ConnectionTrait, Expr, OnConflict}; use migration::{Expr, OnConflict};
use serde_json::json; use serde_json::json;
use siwe::{Message, VerificationOpts}; use siwe::{Message, VerificationOpts};
use std::ops::Add; use std::ops::Add;
@ -76,7 +73,7 @@ pub async fn admin_increase_balance(
.map_err(|_| { .map_err(|_| {
Web3ProxyError::BadRequest("Unable to parse user_address as an Address".to_string()) Web3ProxyError::BadRequest("Unable to parse user_address as an Address".to_string())
})?; })?;
let user_address_bytes: Vec<u8> = user_address.clone().to_fixed_bytes().into(); let user_address_bytes: Vec<u8> = user_address.to_fixed_bytes().into();
let note: String = params let note: String = params
.get("note") .get("note")
.ok_or_else(|| { .ok_or_else(|| {
@ -94,11 +91,8 @@ pub async fn admin_increase_balance(
Web3ProxyError::BadRequest("Unable to get the amount key from the request".to_string()) Web3ProxyError::BadRequest("Unable to get the amount key from the request".to_string())
}) })
.map(|x| Decimal::from_str(x))? .map(|x| Decimal::from_str(x))?
.or_else(|err| { .map_err(|err| {
Err(Web3ProxyError::BadRequest(format!( Web3ProxyError::BadRequest(format!("Unable to parse amount from the request {:?}", err))
"Unable to parse amount from the request {:?}",
err
)))
})?; })?;
let user_entry: user::Model = user::Entity::find() let user_entry: user::Model = user::Entity::find()

4
web3_proxy/src/rpcs/request.rs
View File

@ -184,7 +184,9 @@ impl OpenRequestHandle {
} else if let Some(ref p) = self.rpc.ws_provider { } else if let Some(ref p) = self.rpc.ws_provider {
p.request(method, params).await p.request(method, params).await
} else { } else {
unimplemented!("no provider. cannot send request") return Err(ProviderError::CustomError(
"no provider configured!".to_string(),
));
}; };
// we do NOT want to measure errors, so we intentionally do not record this latency now. // we do NOT want to measure errors, so we intentionally do not record this latency now.