npub1zm…wp7up on Nostr: commit 421ea17c9ba352e86f5672fc1208352ff9148236 Author: randymcmillan ...

commit 421ea17c9ba352e86f5672fc1208352ff9148236
Author: randymcmillan <[email protected]>
Date: Mon May 13 17:55:29 2024 -0400

bins:apply cargo +nightly fmt

diff --git a/bins/src/bin/gnostr-legit.rs b/bins/src/bin/gnostr-legit.rs
index f265ce5a8..ad5217342 100644
--- a/bins/src/bin/gnostr-legit.rs
+++ b/bins/src/bin/gnostr-legit.rs
@@ -155,10 +155,9 @@ fn main() -> io::Result<()> {
//gnostr-git config --global --replace-all gnostr.relays "$(gnostr-get-relays)"
// #&& git config -l | grep gnostr.relays

-//TODO:
-//fix this
-//git config --global --replace-all gnostr.relays $(gnostr-get-relays)
-
+ //TODO:
+ //fix this
+ //git config --global --replace-all gnostr.relays $(gnostr-get-relays)

//#[allow(clippy::if_same_then_else)]
//let set_relays = if cfg!(target_os = "windows") {
diff --git a/bins/src/bin/gnostr-post-event.rs b/bins/src/bin/gnostr-post-event.rs
index 9c444f09f..d6e8f835c 100644
--- a/bins/src/bin/gnostr-post-event.rs
+++ b/bins/src/bin/gnostr-post-event.rs
@@ -6,7 +6,6 @@ use gnostr_types::Event;

static DEFAULT_RELAY_URL: &str = "wss://nos.lol";
fn main() {
-
let mut relay_url = DEFAULT_RELAY_URL;
if relay_url == DEFAULT_RELAY_URL {}
let args_vector: Vec<String> = env::args().collect();
@@ -28,7 +27,7 @@ fn main() {
let event: Event = serde_json::from_str(&s).unwrap();
relay_url = DEFAULT_RELAY_URL;
//always reprint s for further piping
- println!("{}",s);
+ println!("{}", s);
gnostr_bins::post_event(&relay_url, event);
};
if args_vector.len() == 2 {
@@ -60,7 +59,7 @@ fn main() {
std::io::stdin().read_to_string(&mut s).unwrap();
let event: Event = serde_json::from_str(&s).unwrap();
//always reprint s for further piping
- println!("{}",s);
+ println!("{}", s);
gnostr_bins::post_event(relay_url, event);
process::exit(0);
}
@@ -73,7 +72,7 @@ fn main() {
std::io::stdin().read_to_string(&mut s).unwrap();
let event: Event = serde_json::from_str(&s).unwrap();
//always reprint s for further piping
- println!("{}",s);
+ println!("{}", s);
gnostr_bins::post_event(relay_url, event);
process::exit(0);
};
@@ -86,7 +85,7 @@ fn main() {
std::io::stdin().read_to_string(&mut s).unwrap();
let event: Event = serde_json::from_str(&s).unwrap();
//always reprint s for further piping
- println!("{}",s);
+ println!("{}", s);
gnostr_bins::post_event(relay_url, event);
process::exit(0);
}
@@ -94,7 +93,7 @@ fn main() {
let mut s: String = String::new();
std::io::stdin().read_to_string(&mut s).unwrap();
//always reprint s for further piping
- println!("{}",s);
+ println!("{}", s);
let event: Event = serde_json::from_str(&s).unwrap();
gnostr_bins::post_event(relay_url, event);
};
diff --git a/bins/src/bin/gnostr-serve.rs b/bins/src/bin/gnostr-serve.rs
index 276e356d4..d775b2cb4 100755
--- a/bins/src/bin/gnostr-serve.rs
+++ b/bins/src/bin/gnostr-serve.rs
@@ -1,21 +1,15 @@
-use bytes::Bytes;
-use hyper::{
- body::to_bytes,
- service::{make_service_fn, service_fn},
- Body, Request, Server,
-};
-use gnostr_bins::serve::*;
-use gnostr_bins::router;
-use gnostr_bins::router::Router;
-use gnostr_bins::handler;
-use gnostr_bins::router::Handler;
-use gnostr_bins::serve::AppState;
-
-use route_recognizer::Params;
-use std::sync::Arc;
-
use std::env;
use std::process::exit;
+use std::sync::Arc;
+
+use bytes::Bytes;
+use gnostr_bins::router::{Handler, Router};
+use gnostr_bins::serve::{AppState, *};
+use gnostr_bins::{handler, router};
+use hyper::body::to_bytes;
+use hyper::service::{make_service_fn, service_fn};
+use hyper::{Body, Request, Server};
+use route_recognizer::Params;

type Error = Box<dyn std::error::Error + Send + Sync + 'static>;

@@ -62,9 +56,9 @@ async fn main() {
println!("curl http://localhost:{}/test";, &str_port);
println!("curl http://localhost:{}/params/1234";, &str_port);
println!(
- "curl -X POST http://localhost:{}/send -d '{{\"name\": \"chip\", \"active\": true}}'",
- &str_port
- );
+ "curl -X POST http://localhost:{}/send -d '{{\"name\": \"chip\", \"active\": true}}'",
+ &str_port
+ );
}
let some_state = "state".to_string();

@@ -103,12 +97,15 @@ async fn route(
let found_handler = router.route(req.uri().path(), req.method());
let resp = found_handler
.handler
- .invoke(gnostr_bins::serve::Context::new(app_state, req, found_handler.params))
+ .invoke(gnostr_bins::serve::Context::new(
+ app_state,
+ req,
+ found_handler.params,
+ ))
.await;
Ok(resp)
}

-
pub fn add(a: i32, b: i32) -> i32 {
a + b
}
@@ -123,10 +120,10 @@ fn bad_add(a: i32, b: i32) -> i32 {
#[cfg(test)]
mod tests {
// Note this useful idiom: importing names from outer (for mod tests) scope.
- use super::*;
-
use std::process::Command;

+ use super::*;
+
#[test]
fn curl_test() {
let url = "http://localhost:8080/test";;
diff --git a/bins/src/bin/gnostr-sha256.rs b/bins/src/bin/gnostr-sha256.rs
index 065c68740..3db075049 100644
--- a/bins/src/bin/gnostr-sha256.rs
+++ b/bins/src/bin/gnostr-sha256.rs
@@ -46,10 +46,10 @@ fn main() -> Result<()> {
let args: Vec<String> = env::args().collect();
let _appname = &args[0];
//catch empty query first
- if args.len()== 1 {
+ if args.len() == 1 {
use sha256::digest;
let query = digest("");
- print!("{}",query);
+ print!("{}", query);
process::exit(0);
}

@@ -73,15 +73,14 @@ fn main() -> Result<()> {
#[cfg(debug_assertions)]
println!("cwd={:#?}", cwd);

- if args[1] == "-h" || args[1] == "--help"{
+ if args[1] == "-h" || args[1] == "--help" {
let crate_name = env!("CARGO_CRATE_NAME");
- print!("{}", crate_name.replace("_","-"));
+ print!("{}", crate_name.replace("_", "-"));
print!(" gnostr-sha256 <file_path>\n");
process::exit(0);
}
- if args[1] == "-v" || args[1] == "--version"{
-
- print!("{}",env!("CARGO_PKG_VERSION"));
+ if args[1] == "-v" || args[1] == "--version" {
+ print!("{}", env!("CARGO_PKG_VERSION"));
process::exit(0);
}

diff --git a/bins/src/gitminer.rs b/bins/src/gitminer.rs
index e7039360e..3ccc67daa 100644
--- a/bins/src/gitminer.rs
+++ b/bins/src/gitminer.rs
@@ -205,8 +205,8 @@ impl Gitminer {
Ok(format!("{} <{}>", name, email))
}

- //fn load_gnostr_relays(repo: &git2::Repository) -> Result<String, &'static str> {
- // let cfg = match repo.config() {
+ //fn load_gnostr_relays(repo: &git2::Repository) -> Result<String, &'static
+ // str> { let cfg = match repo.config() {
// Ok(c) => c,
// Err(_) => {
// return Err("Failed to load git config gnostr.relays");
diff --git a/bins/src/handler.rs b/bins/src/handler.rs
index ee14668db..4f3780385 100755
--- a/bins/src/handler.rs
+++ b/bins/src/handler.rs
@@ -1,9 +1,9 @@
-use crate::serve;
-use crate::serve::Context;
-use crate::serve::Response;
use hyper::StatusCode;
use serde::Deserialize;

+use crate::serve;
+use crate::serve::{Context, Response};
+
pub async fn test_handler(ctx: Context) -> String {
format!("test called, state_thing was: {}", ctx.state.state_thing)
}
diff --git a/bins/src/lib.rs b/bins/src/lib.rs
index 6b6406058..b7753e903 100644
--- a/bins/src/lib.rs
+++ b/bins/src/lib.rs
@@ -26,8 +26,8 @@ pub mod worker;
pub use worker::*;

//gnostr-server
-pub mod router;
pub mod handler;
+pub mod router;
pub mod serve;

/// REF: https://api.nostr.watch
diff --git a/bins/src/router.rs b/bins/src/router.rs
index 1a0e9c01b..40c7c1bac 100755
--- a/bins/src/router.rs
+++ b/bins/src/router.rs
@@ -1,12 +1,13 @@
//use crate::serve::*;
-use crate::serve;
-use crate::serve::Context;
-use crate::serve::Response;
+use std::collections::HashMap;
+
use async_trait::async_trait;
use futures::future::Future;
use hyper::{Method, StatusCode};
use route_recognizer::{Match, Params, Router as InternalRouter};
-use std::collections::HashMap;
+
+use crate::serve;
+use crate::serve::{Context, Response};

#[async_trait]
pub trait Handler: Send + Sync + 'static {
diff --git a/bins/src/serve.rs b/bins/src/serve.rs
index 08ce52f4b..82a52593b 100644
--- a/bins/src/serve.rs
+++ b/bins/src/serve.rs
@@ -1,14 +1,12 @@
-use bytes::Bytes;
-use hyper::{
- body::to_bytes,
- service::{make_service_fn, service_fn},
- Body, Request, Server,
-};
-use route_recognizer::Params;
-use std::sync::Arc;
-
use std::env;
use std::process::exit;
+use std::sync::Arc;
+
+use bytes::Bytes;
+use hyper::body::to_bytes;
+use hyper::service::{make_service_fn, service_fn};
+use hyper::{Body, Request, Server};
+use route_recognizer::Params;

//#[tokio::main]
//async fn main() {
@@ -156,10 +154,10 @@ fn bad_add(a: i32, b: i32) -> i32 {
#[cfg(test)]
mod tests {
// Note this useful idiom: importing names from outer (for mod tests) scope.
- use super::*;
-
use std::process::Command;

+ use super::*;
+
#[test]
fn curl_test() {
let url = "http://localhost:8080/test";;