github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

cli_config: removed 'accept_url' from cashierd

Browse Source 
cashierd: changed 'accept_url' to 'rpc_url'
This commit is contained in:
lunar-mining
2021-09-21 11:24:20 +02:00
parent 2daa4290ee
commit ca55ecfa5d
3 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/bin/cashierd.rs
View File

@@ -66,15 +66,8 @@ impl Cashierd {
let client_wallet_path = join_config_path(&PathBuf::from("cashier_client_wallet.db"))?;
let cashier_wallet = CashierDb::new(
&cashier_wallet_path,
config.password.clone(),
)?;
let client_wallet = WalletDb::new(
&client_wallet_path.clone(),
config.password.clone(),
)?;
let cashier_wallet = CashierDb::new(&cashier_wallet_path, config.password.clone())?;
let client_wallet = WalletDb::new(&client_wallet_path.clone(), config.password.clone())?;
let database_path = join_config_path(&PathBuf::from("cashier_database.db"))?;
@@ -230,13 +223,34 @@ impl Cashierd {
return JsonResult::Err(jsonerr(InvalidParams, None, id));
}
let tkn_str = tkn.as_str().unwrap();
debug!(target: "CASHIER", "Token STR length: {}", tkn_str.len());
let _tkn_fr = jubjub::Fr::from_str(tkn_str);
// TODO: debug this
//if tkn_fr.is_none() {
// return JsonResult::Err(jsonerr(InvalidParams, None, id));
//};
//let token = tkn_fr.unwrap();
//
// 1. attempt to decode data
// 2. decoding fails
// 3. increment counter
// 4. write counter to top bytes
// 5. loop back again
//
let mut counter = 0;
let tkn_fr = jubjub::Fr::from_str(tkn_str);
if tkn_fr.is_none() {
debug!(target: "CASHIER", "TOKEN IS NONE. COMMENCING LOOP");
loop {
counter += 1;
debug!(target: "CASHIER", "LOOP NUMBER {}", counter);
counter.to_string().push_str(tkn_str);
debug!(target: "CASHIER", "STR length: {}", tkn_str.len());
let tkn_fr = jubjub::Fr::from_str(tkn_str);
if tkn_fr.is_none() {
continue;
}
break;
//return JsonResult::Err(jsonerr(InvalidParams, None, id));
}
};
let token = tkn_fr.unwrap();
if pk.as_str().is_none() {
return JsonResult::Err(jsonerr(InvalidParams, None, id));
@@ -386,3 +400,33 @@ async fn main() -> Result<()> {
Ok(())
}
#[cfg(test)]
mod tests {
use ff::PrimeField;
#[test]
fn test_jubjub_parsing() {
let mut counter = 0;
let tkn = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
let tkn_fr = jubjub::Fr::from_str(tkn);
if tkn_fr.is_none() {
println!("TOKEN IS NONE. COMMENCING LOOP");
loop {
counter += 1;
println!("LOOP NUMBER {}", counter);
counter.to_string().push_str(tkn);
println!("STR length: {}", tkn.len());
let tkn_fr = jubjub::Fr::from_str(tkn);
if tkn_fr.is_none() {
continue;
}
println!("TOKEN PARSING SUCCESSFUL");
break;
}
};
let token = tkn_fr.unwrap();
println!("UNWRAP SUCCESSFUL {:?}", token);
}
}

14
src/cli/cli_config.rs
View File

@@ -48,12 +48,11 @@ pub struct DarkfidConfig {
#[serde(rename = "rpc_url")]
pub rpc_url: String,
#[serde(rename = "database_path")]
pub database_path: String,
#[serde(rename = "walletdb_path")]
pub walletdb_path: String,
//TODO: reimplement this
//#[serde(rename = "database_path")]
//pub database_path: String,
//#[serde(rename = "walletdb_path")]
//pub walletdb_path: String,
#[serde(rename = "log_path")]
pub log_path: String,
@@ -75,9 +74,6 @@ pub struct GatewaydConfig {
#[derive(Clone, Serialize, Deserialize, Debug)]
pub struct CashierdConfig {
#[serde(rename = "accept_url")]
pub accept_url: String,
#[serde(rename = "rpc_url")]
pub rpc_url: String,