Skip to content
Snippets Groups Projects
Commit c7566976 authored by Éloïs's avatar Éloïs
Browse files

[ref] ws2p-v1: remove useless field in OldNetworkRequest

parent 9e044f70
No related branches found
No related tags found
1 merge request!127Elois/fixs
Show whitespace changes
Inline Side-by-side
Showing
with 52 additions and 79 deletions
lib/core/network/requests.rs
+ 7
− 7
View file @ c7566976
...@@ -24,12 +24,12 @@ use dubp_documents::Blockstamp; ...@@ -24,12 +24,12 @@ use dubp_documents::Blockstamp;
/// Type containing a request addressed to the network module /// Type containing a request addressed to the network module
pub enum OldNetworkRequest { pub enum OldNetworkRequest {
/// Get a current block of a specific node /// Get a current block of a specific node
GetCurrent(ModuleReqFullId, NodeFullId), GetCurrent(ModuleReqFullId),
//GetBlock(NodeFullId, u64), //GetBlock(u64),
/// Get a blocks chunk from specified node /// Get a blocks chunk from specified node
GetBlocks(ModuleReqFullId, NodeFullId, u32, u32), GetBlocks(ModuleReqFullId, u32, u32),
/// Get pending wot documents from specified node /// Get pending wot documents from specified node
GetRequirementsPending(ModuleReqFullId, NodeFullId, u32), GetRequirementsPending(ModuleReqFullId, u32),
/// Obtain the current network consensus /// Obtain the current network consensus
GetConsensus(ModuleReqFullId), GetConsensus(ModuleReqFullId),
/// Getting the heads cache /// Getting the heads cache
...@@ -42,9 +42,9 @@ impl OldNetworkRequest { ...@@ -42,9 +42,9 @@ impl OldNetworkRequest {
/// Get request full identitifier /// Get request full identitifier
pub fn get_req_full_id(&self) -> ModuleReqFullId { pub fn get_req_full_id(&self) -> ModuleReqFullId {
match *self { match *self {
OldNetworkRequest::GetCurrent(ref req_id, _) OldNetworkRequest::GetCurrent(ref req_id)
| OldNetworkRequest::GetBlocks(ref req_id, _, _, _) | OldNetworkRequest::GetBlocks(ref req_id, _, _)
| OldNetworkRequest::GetRequirementsPending(ref req_id, _, _) | OldNetworkRequest::GetRequirementsPending(ref req_id, _)
| OldNetworkRequest::GetConsensus(ref req_id) | OldNetworkRequest::GetConsensus(ref req_id)
| OldNetworkRequest::GetHeadsCache(ref req_id) | OldNetworkRequest::GetHeadsCache(ref req_id)
| OldNetworkRequest::GetEndpoints(ref req_id) => *req_id, | OldNetworkRequest::GetEndpoints(ref req_id) => *req_id,
......
lib/modules/blockchain/blockchain/src/dunp/queries.rs
+ 0
− 1
View file @ c7566976
...@@ -45,7 +45,6 @@ pub fn request_chunk( ...@@ -45,7 +45,6 @@ pub fn request_chunk(
) -> (ModuleReqId, OldNetworkRequest) { ) -> (ModuleReqId, OldNetworkRequest) {
let req = OldNetworkRequest::GetBlocks( let req = OldNetworkRequest::GetBlocks(
ModuleReqFullId(BlockchainModule::name(), req_id), ModuleReqFullId(BlockchainModule::name(), req_id),
NodeFullId::default(),
*CHUNK_SIZE, *CHUNK_SIZE,
from, from,
); );
......
lib/modules/blockchain/blockchain/src/lib.rs
+ 0
− 1
View file @ c7566976
...@@ -70,7 +70,6 @@ use durs_message::events::*; ...@@ -70,7 +70,6 @@ use durs_message::events::*;
use durs_message::requests::*; use durs_message::requests::*;
use durs_message::responses::*; use durs_message::responses::*;
use durs_message::*; use durs_message::*;
use durs_network_documents::NodeFullId;
use durs_wot::data::rusty::RustyWebOfTrust; use durs_wot::data::rusty::RustyWebOfTrust;
use durs_wot::operations::distance::RustyDistanceCalculator; use durs_wot::operations::distance::RustyDistanceCalculator;
use durs_wot::NodeId; use durs_wot::NodeId;
......
lib/modules/blockchain/blockchain/src/responses/received.rs
+ 1
− 1
View file @ c7566976
...@@ -33,7 +33,7 @@ pub fn receive_response( ...@@ -33,7 +33,7 @@ pub fn receive_response(
} }
} }
} }
OldNetworkRequest::GetBlocks(_, _, _, _) => { OldNetworkRequest::GetBlocks(_, _, _) => {
if let NetworkResponse::Chunk(_, _, blocks) = network_response { if let NetworkResponse::Chunk(_, _, blocks) = network_response {
dunp::receiver::receive_blocks(bc, blocks); dunp::receiver::receive_blocks(bc, blocks);
} }
......
lib/modules/ws2p-v1-legacy/datas.rs
+ 5
− 5
View file @ c7566976
...@@ -428,12 +428,12 @@ impl WS2PModuleDatas { ...@@ -428,12 +428,12 @@ impl WS2PModuleDatas {
} }
// Detect timeout requests // Detect timeout requests
let mut requests_timeout = Vec::new(); let mut requests_timeout = Vec::new();
for &(ref req, ref _ws2p_full_id, ref timestamp) in for &(ref req, ref ws2p_full_id, ref timestamp) in
self.requests_awaiting_response.clone().values() self.requests_awaiting_response.clone().values()
{ {
if SystemTime::now().duration_since(*timestamp).unwrap() > Duration::new(20, 0) { if SystemTime::now().duration_since(*timestamp).unwrap() > Duration::new(20, 0) {
requests_timeout.push(req.get_req_full_id()); requests_timeout.push(req.get_req_full_id());
warn!("request timeout : {:?}", req); warn!("request timeout : {:?} (sent to {:?})", req, ws2p_full_id);
} }
} }
// Delete (and resend) timeout requests // Delete (and resend) timeout requests
......
lib/modules/ws2p-v1-legacy/lib.rs
+ 36
− 59
View file @ c7566976
...@@ -425,57 +425,47 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -425,57 +425,47 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
match *old_net_request { match *old_net_request {
OldNetworkRequest::GetBlocks( OldNetworkRequest::GetBlocks(
ref req_id, ref req_id,
ref receiver,
ref count, ref count,
ref from, ref from,
) => { ) => {
if *receiver == NodeFullId::default() {
let mut receiver_index = 0; let mut receiver_index = 0;
let mut real_receiver = NodeFullId::default(); let mut real_receiver = None;
for (ws2p_full_id, (_ep, state)) in for (ws2p_full_id, (_ep, state)) in
ws2p_module.ws2p_endpoints.clone() ws2p_module.ws2p_endpoints.clone()
{ {
if let WS2PConnectionState::Established = state if let WS2PConnectionState::Established = state {
{
if receiver_index == next_receiver { if receiver_index == next_receiver {
real_receiver = ws2p_full_id; real_receiver = Some(ws2p_full_id);
break; break;
} }
receiver_index += 1; receiver_index += 1;
} }
} }
if real_receiver == NodeFullId::default() { if real_receiver.is_none() {
next_receiver = 0; next_receiver = 0;
for (ws2p_full_id, (_ep, state)) in for (ws2p_full_id, (_ep, state)) in
ws2p_module.ws2p_endpoints.clone() &ws2p_module.ws2p_endpoints
{ {
if let WS2PConnectionState::Established = if let WS2PConnectionState::Established = *state
state
{ {
real_receiver = ws2p_full_id; real_receiver = Some(*ws2p_full_id);
break; break;
} }
} }
} else { } else {
next_receiver += 1; next_receiver += 1;
} }
if real_receiver != NodeFullId::default() { if let Some(real_receiver) = real_receiver {
debug!("WS2P: send req to: ({:?})", real_receiver);
let _blocks_request_result = ws2p_module let _blocks_request_result = ws2p_module
.send_request_to_specific_node( .send_request_to_specific_node(
&real_receiver, &real_receiver,
&OldNetworkRequest::GetBlocks( &OldNetworkRequest::GetBlocks(
*req_id, *receiver, *count, *from, *req_id, *count, *from,
), ),
); );
}
} else { } else {
let _blocks_request_result = ws2p_module warn!("WS2P: not found peer to send request !");
.send_request_to_specific_node(
&receiver,
&OldNetworkRequest::GetBlocks(
*req_id, *receiver, *count, *from,
),
);
} }
} }
OldNetworkRequest::GetEndpoints(ref _request) => {} OldNetworkRequest::GetEndpoints(ref _request) => {}
...@@ -628,13 +618,13 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -628,13 +618,13 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
let req_id = let req_id =
ModuleReqId(ws2p_module.requests_awaiting_response.len() as u32); ModuleReqId(ws2p_module.requests_awaiting_response.len() as u32);
let module_id = WS2PModule::name(); let module_id = WS2PModule::name();
debug!("WS2P: send req to: ({:?})", ws2p_full_id);
let _current_request_result = ws2p_module let _current_request_result = ws2p_module
.send_request_to_specific_node( .send_request_to_specific_node(
&ws2p_full_id, &ws2p_full_id,
&OldNetworkRequest::GetCurrent( &OldNetworkRequest::GetCurrent(ModuleReqFullId(
ModuleReqFullId(module_id, req_id), module_id, req_id,
ws2p_full_id, )),
),
); );
if ws2p_module.uids_cache.get(&ws2p_full_id.1).is_none() { if ws2p_module.uids_cache.get(&ws2p_full_id.1).is_none() {
ws2p_module.send_dal_request(&BlockchainRequest::UIDs(vec![ ws2p_module.send_dal_request(&BlockchainRequest::UIDs(vec![
...@@ -746,7 +736,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -746,7 +736,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
} }
WS2PSignal::ReqResponse(req_id, req, recipient_full_id, response) => { WS2PSignal::ReqResponse(req_id, req, recipient_full_id, response) => {
match req { match req {
OldNetworkRequest::GetCurrent(ref _req_id, _receiver) => { OldNetworkRequest::GetCurrent(ref _req_id) => {
info!("WS2PSignal::ReceiveCurrent({}, {:?})", req_id.0, req); info!("WS2PSignal::ReceiveCurrent({}, {:?})", req_id.0, req);
if let Some(block) = parse_json_block(&response) { if let Some(block) = parse_json_block(&response) {
ws2p_module.send_network_req_response( ws2p_module.send_network_req_response(
...@@ -760,12 +750,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -760,12 +750,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
); );
} }
} }
OldNetworkRequest::GetBlocks( OldNetworkRequest::GetBlocks(ref _req_id, count, from) => {
ref _req_id,
_node_full_id,
count,
from,
) => {
info!( info!(
"WS2PSignal::ReceiveChunk({}, {} blocks from {})", "WS2PSignal::ReceiveChunk({}, {} blocks from {})",
req_id.0, count, from req_id.0, count, from
...@@ -785,11 +770,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule { ...@@ -785,11 +770,7 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
); );
} }
} }
OldNetworkRequest::GetRequirementsPending( OldNetworkRequest::GetRequirementsPending(_req_id, min_cert) => {
_req_id,
_receiver,
min_cert,
) => {
info!( info!(
"WS2PSignal::ReceiveRequirementsPending({}, {})", "WS2PSignal::ReceiveRequirementsPending({}, {})",
req_id.0, min_cert req_id.0, min_cert
...@@ -1118,12 +1099,8 @@ mod tests { ...@@ -1118,12 +1099,8 @@ mod tests {
#[test] #[test]
fn ws2p_requests() { fn ws2p_requests() {
let module_id = WS2PModule::name(); let module_id = WS2PModule::name();
let request = OldNetworkRequest::GetBlocks( let request =
ModuleReqFullId(module_id, ModuleReqId(58)), OldNetworkRequest::GetBlocks(ModuleReqFullId(module_id, ModuleReqId(58)), 50, 0);
NodeFullId::default(),
50,
0,
);
assert_eq!( assert_eq!(
network_request_to_json(&request), network_request_to_json(&request),
json!({ json!({
......
lib/modules/ws2p-v1-legacy/ws2p_requests.rs
+ 3
− 5
View file @ c7566976
...@@ -2,10 +2,8 @@ use duniter_network::requests::OldNetworkRequest; ...@@ -2,10 +2,8 @@ use duniter_network::requests::OldNetworkRequest;
pub fn network_request_to_json(request: &OldNetworkRequest) -> serde_json::Value { pub fn network_request_to_json(request: &OldNetworkRequest) -> serde_json::Value {
let (request_id, request_type, request_params) = match *request { let (request_id, request_type, request_params) = match *request {
OldNetworkRequest::GetCurrent(ref req_full_id, _receiver) => { OldNetworkRequest::GetCurrent(ref req_full_id) => (req_full_id.1, "CURRENT", json!({})),
(req_full_id.1, "CURRENT", json!({})) OldNetworkRequest::GetBlocks(ref req_full_id, count, from_mumber) => (
}
OldNetworkRequest::GetBlocks(ref req_full_id, _receiver, count, from_mumber) => (
req_full_id.1, req_full_id.1,
"BLOCKS_CHUNK", "BLOCKS_CHUNK",
json!({ json!({
...@@ -13,7 +11,7 @@ pub fn network_request_to_json(request: &OldNetworkRequest) -> serde_json::Value ...@@ -13,7 +11,7 @@ pub fn network_request_to_json(request: &OldNetworkRequest) -> serde_json::Value
"fromNumber": from_mumber "fromNumber": from_mumber
}), }),
), ),
OldNetworkRequest::GetRequirementsPending(ref req_full_id, _receiver, min_cert) => ( OldNetworkRequest::GetRequirementsPending(ref req_full_id, min_cert) => (
req_full_id.1, req_full_id.1,
"WOT_REQUIREMENTS_OF_PENDING", "WOT_REQUIREMENTS_OF_PENDING",
json!({ "minCert": min_cert }), json!({ "minCert": min_cert }),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment