Cuprate/cuprate
Cuprate/cuprate
1
0
Fork 0
mirror of https://github.com/Cuprate/cuprate.git synced 2025-01-08 20:09:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix ci

Browse source
This commit is contained in:
Boog900 2024-11-10 21:20:42 +00:00
parent e652c189e5
commit 7c5fa6db20
No known key found for this signature in database
GPG key ID: 42AB1287CB0041C2
7 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -551,7 +551,6 @@ version = "0.1.0"
dependencies = [ dependencies = [
"borsh", "borsh",
"cuprate-constants", "cuprate-constants",
"cuprate-helper",
"cuprate-p2p-core", "cuprate-p2p-core",
"cuprate-pruning", "cuprate-pruning",
"cuprate-test-utils", "cuprate-test-utils",
@ -881,7 +880,6 @@ dependencies = [
"futures", "futures",
"hex", "hex",
"hex-literal", "hex-literal",
"serde",
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-stream", "tokio-stream",

2
binaries/cuprated/Cargo.toml
View file

@ -20,7 +20,7 @@ cuprate-fixed-bytes = { workspace = true }
cuprate-levin = { workspace = true } cuprate-levin = { workspace = true }
cuprate-wire = { workspace = true } cuprate-wire = { workspace = true }
cuprate-p2p = { workspace = true } cuprate-p2p = { workspace = true }
cuprate-p2p-core = { workspace = true, features = ["serde"] } cuprate-p2p-core = { workspace = true }
cuprate-dandelion-tower = { workspace = true, features = ["txpool"] } cuprate-dandelion-tower = { workspace = true, features = ["txpool"] }
cuprate-async-buffer = { workspace = true } cuprate-async-buffer = { workspace = true }
cuprate-address-book = { workspace = true } cuprate-address-book = { workspace = true }

13
binaries/cuprated/src/config/p2p.rs
View file

@ -1,9 +1,12 @@
use cuprate_helper::fs::addressbook_path; use std::{
use cuprate_helper::network::Network; net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
path::Path,
time::Duration,
};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use std::path::Path; use cuprate_helper::{fs::addressbook_path, network::Network};
use std::time::Duration;
/// P2P config. /// P2P config.
#[derive(Default, Deserialize, Serialize)] #[derive(Default, Deserialize, Serialize)]

3
binaries/cuprated/src/config/storage.rs
View file

@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use std::path::PathBuf; use std::path::PathBuf;
use serde::{Deserialize, Serialize};
use cuprate_database::config::SyncMode; use cuprate_database::config::SyncMode;
use cuprate_database_service::ReaderThreads; use cuprate_database_service::ReaderThreads;
use cuprate_helper::fs::CUPRATE_DATA_DIR; use cuprate_helper::fs::CUPRATE_DATA_DIR;

1
p2p/address-book/Cargo.toml
View file

@ -8,7 +8,6 @@ authors = ["Boog900"]
[dependencies] [dependencies]
cuprate-constants = { workspace = true } cuprate-constants = { workspace = true }
cuprate-helper = { workspace = true, features = ["std"], optional = true }
cuprate-pruning = { workspace = true } cuprate-pruning = { workspace = true }
cuprate-p2p-core = { workspace = true, features = ["borsh"] } cuprate-p2p-core = { workspace = true, features = ["borsh"] }

1
p2p/p2p-core/Cargo.toml
View file

@ -28,7 +28,6 @@ tracing = { workspace = true, features = ["std", "attributes"] }
hex-literal = { workspace = true } hex-literal = { workspace = true }
borsh = { workspace = true, features = ["derive", "std"], optional = true } borsh = { workspace = true, features = ["derive", "std"], optional = true }
serde = { workspace = true, features = ["derive", "std"], optional = true }
[dev-dependencies] [dev-dependencies]
cuprate-test-utils = { workspace = true } cuprate-test-utils = { workspace = true }

12
p2p/p2p-core/src/network_zones/clear.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
net::{IpAddr, Ipv4Addr, SocketAddr}, net::{IpAddr, SocketAddr},
pin::Pin, pin::Pin,
task::{Context, Poll}, task::{Context, Poll},
}; };
@ -38,20 +38,10 @@ impl NetZoneAddress for SocketAddr {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
pub struct ClearNetServerCfg { pub struct ClearNetServerCfg {
pub ip: IpAddr, pub ip: IpAddr,
} }
impl Default for ClearNetServerCfg {
fn default() -> Self {
Self {
ip: IpAddr::V4(Ipv4Addr::UNSPECIFIED),
}
}
}
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub enum ClearNet {} pub enum ClearNet {}