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

[ref] rename : NetworkRequest -> OldNetworkRequest

parent c74284d7
No related branches found
No related tags found
1 merge request!84Inject plugins cli
Show whitespace changes
Inline Side-by-side
blockchain/lib.rs
+ 12
− 12
View file @ 77541206
......@@ -76,7 +76,7 @@ use duniter_documents::*;
use duniter_message::*;
use duniter_module::*;
use duniter_network::{
NetworkBlock, NetworkDocument, NetworkEvent, NetworkRequest, NetworkResponse, NodeFullId,
NetworkBlock, NetworkDocument, NetworkEvent, NetworkResponse, NodeFullId, OldNetworkRequest,
};
use duniter_wotb::data::rusty::RustyWebOfTrust;
use duniter_wotb::operations::distance::RustyDistanceCalculator;
......@@ -221,8 +221,8 @@ impl BlockchainModule {
sync::sync_ts(profile, conf, db_ts_path, cautious, verif_inner_hash);
}
/// Request chunk from network (chunk = group of blocks)
fn request_chunk(&self, req_id: ModuleReqId, from: u32) -> (ModuleReqId, NetworkRequest) {
let req = NetworkRequest::GetBlocks(
fn request_chunk(&self, req_id: ModuleReqId, from: u32) -> (ModuleReqId, OldNetworkRequest) {
let req = OldNetworkRequest::GetBlocks(
ModuleReqFullId(BlockchainModule::name(), req_id),
NodeFullId::default(),
*CHUNK_SIZE,
......@@ -233,10 +233,10 @@ impl BlockchainModule {
/// Requests blocks from current to `to`
fn request_blocks_to(
&self,
pending_network_requests: &HashMap<ModuleReqId, NetworkRequest>,
pending_network_requests: &HashMap<ModuleReqId, OldNetworkRequest>,
current_blockstamp: &Blockstamp,
to: BlockId,
) -> HashMap<ModuleReqId, NetworkRequest> {
) -> HashMap<ModuleReqId, OldNetworkRequest> {
let mut from = if *current_blockstamp == Blockstamp::default() {
0
} else {
......@@ -269,13 +269,13 @@ impl BlockchainModule {
requests_ids
}
/// Send network request
fn request_network(&self, _req_id: ModuleReqId, request: &NetworkRequest) -> ModuleReqId {
fn request_network(&self, _req_id: ModuleReqId, request: &OldNetworkRequest) -> ModuleReqId {
self.rooter_sender
.send(RooterThreadMessage::ModuleMessage(DursMsg(
DursMsgReceiver::Role(ModuleRole::InterNodesNetwork),
DursMsgContent::NetworkRequest(*request),
DursMsgContent::OldNetworkRequest(*request),
)))
.unwrap_or_else(|_| panic!("Fail to send NetworkRequest to rooter"));
.unwrap_or_else(|_| panic!("Fail to send OldNetworkRequest to rooter"));
request.get_req_id()
}
/// Send blockchain event
......@@ -525,12 +525,12 @@ impl BlockchainModule {
// Init datas
let mut last_get_stackables_blocks = UNIX_EPOCH;
let mut last_request_blocks = UNIX_EPOCH;
let mut pending_network_requests: HashMap<ModuleReqId, NetworkRequest> = HashMap::new();
let mut pending_network_requests: HashMap<ModuleReqId, OldNetworkRequest> = HashMap::new();
let mut consensus = Blockstamp::default();
loop {
// Request Consensus
let req = NetworkRequest::GetConsensus(ModuleReqFullId(
let req = OldNetworkRequest::GetConsensus(ModuleReqFullId(
BlockchainModule::name(),
ModuleReqId(pending_network_requests.len() as u32),
));
......@@ -642,7 +642,7 @@ impl BlockchainModule {
pending_network_requests.remove(&network_response.get_req_id())
{
match request {
NetworkRequest::GetConsensus(_) => {
OldNetworkRequest::GetConsensus(_) => {
if let NetworkResponse::Consensus(_, response) =
*network_response.deref()
{
......@@ -678,7 +678,7 @@ impl BlockchainModule {
}
}
}
NetworkRequest::GetBlocks(_, _, _, _) => {
OldNetworkRequest::GetBlocks(_, _, _, _) => {
if let NetworkResponse::Chunk(_, _, ref blocks) =
*network_response.deref()
{
......
message/lib.rs
+ 5
− 3
View file @ 77541206
......@@ -44,7 +44,7 @@ use duniter_dal::dal_requests::{DALRequest, DALResponse};
use duniter_documents::blockchain::BlockchainProtocol;
use duniter_documents::BlockId;
use duniter_module::*;
use duniter_network::{NetworkEvent, NetworkRequest, NetworkResponse};
use duniter_network::{NetworkEvent, NetworkResponse, OldNetworkRequest};
#[derive(Debug, Clone)]
/// Message exchanged between Durs modules
......@@ -81,10 +81,10 @@ pub enum DursMsgContent {
/// Blockchain event
DALEvent(DALEvent),
/// Request to the network module
NetworkRequest(NetworkRequest),
OldNetworkRequest(OldNetworkRequest),
/// Network event
NetworkEvent(NetworkEvent),
/// Response of NetworkRequest
/// Response of OldNetworkRequest
NetworkResponse(NetworkResponse),
/// Pow module response
ProverResponse(BlockId, Sig, u64),
......@@ -108,6 +108,8 @@ pub struct DursReq {
#[derive(Debug, Clone)]
/// Modules request content
pub enum DursReqContent {
/// Network request (Not yet implemented)
NetworkRequest(),
/// Blockchain datas request
DALRequest(DALRequest),
/// Request to the pow module
......
network/lib.rs
+ 9
− 9
View file @ 77541206
......@@ -259,7 +259,7 @@ pub enum NetworkConsensusError {
#[derive(Debug, Copy, Clone)]
/// Type containing a request addressed to the network module
pub enum NetworkRequest {
pub enum OldNetworkRequest {
/// Get a current block of a specific node
GetCurrent(ModuleReqFullId, NodeFullId),
//GetBlock(NodeFullId, u64),
......@@ -275,16 +275,16 @@ pub enum NetworkRequest {
GetEndpoints(ModuleReqFullId),
}
impl NetworkRequest {
impl OldNetworkRequest {
/// Get request full identitifier
pub fn get_req_full_id(&self) -> ModuleReqFullId {
match *self {
NetworkRequest::GetCurrent(ref req_id, _)
| NetworkRequest::GetBlocks(ref req_id, _, _, _)
| NetworkRequest::GetRequirementsPending(ref req_id, _, _)
| NetworkRequest::GetConsensus(ref req_id)
| NetworkRequest::GetHeadsCache(ref req_id)
| NetworkRequest::GetEndpoints(ref req_id) => *req_id,
OldNetworkRequest::GetCurrent(ref req_id, _)
| OldNetworkRequest::GetBlocks(ref req_id, _, _, _)
| OldNetworkRequest::GetRequirementsPending(ref req_id, _, _)
| OldNetworkRequest::GetConsensus(ref req_id)
| OldNetworkRequest::GetHeadsCache(ref req_id)
| OldNetworkRequest::GetEndpoints(ref req_id) => *req_id,
}
}
/// Get request identitifier
......@@ -295,7 +295,7 @@ impl NetworkRequest {
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
/// Type returned when the network module does not get a satisfying answer to a request
pub enum NetworkRequestError {
pub enum OldNetworkRequestError {
/// Receiving an invalid format response
WrongFormat(),
/// Unknow error
......
ws2p-v1-legacy/datas.rs
+ 10
− 9
View file @ 77541206
......@@ -38,7 +38,8 @@ pub struct WS2PModuleDatas {
),
pub ws2p_endpoints: HashMap<NodeFullId, (EndpointEnum, WS2PConnectionState)>,
pub websockets: HashMap<NodeFullId, WsSender>,
pub requests_awaiting_response: HashMap<ModuleReqId, (NetworkRequest, NodeFullId, SystemTime)>,
pub requests_awaiting_response:
HashMap<ModuleReqId, (OldNetworkRequest, NodeFullId, SystemTime)>,
pub heads_cache: HashMap<NodeFullId, NetworkHead>,
pub my_head: Option<NetworkHead>,
pub uids_cache: HashMap<PubKey, String>,
......@@ -444,15 +445,15 @@ impl WS2PModuleDatas {
/*pub fn send_request_to_all_connections(
&mut self,
ws2p_request: &NetworkRequest,
ws2p_request: &OldNetworkRequest,
) -> Result<(), SendRequestError> {
let mut count_successful_sending: usize = 0;
let mut errors: Vec<ws::Error> = Vec::new();
match *ws2p_request {
NetworkRequest::GetCurrent(req_full_id, _receiver) => {
OldNetworkRequest::GetCurrent(req_full_id, _receiver) => {
for (ws2p_full_id, (_ep, state)) in self.ws2p_endpoints.clone() {
if let WS2PConnectionState::Established = state {
let ws2p_request = NetworkRequest::GetCurrent(
let ws2p_request = OldNetworkRequest::GetCurrent(
ModuleReqFullId(
req_full_id.0,
ModuleReqId(
......@@ -470,12 +471,12 @@ impl WS2PModuleDatas {
}
}
}
/* NetworkRequest::GetBlock(req_full_id, number) => {} */
NetworkRequest::GetBlocks(_req_full_id, _receiver, _count, _from_number) => {}
NetworkRequest::GetRequirementsPending(req_full_id, _receiver, min_cert) => {
/* OldNetworkRequest::GetBlock(req_full_id, number) => {} */
OldNetworkRequest::GetBlocks(_req_full_id, _receiver, _count, _from_number) => {}
OldNetworkRequest::GetRequirementsPending(req_full_id, _receiver, min_cert) => {
for (ws2p_full_id, (_ep, state)) in self.ws2p_endpoints.clone() {
if let WS2PConnectionState::Established = state {
let ws2p_request = NetworkRequest::GetRequirementsPending(
let ws2p_request = OldNetworkRequest::GetRequirementsPending(
ModuleReqFullId(
req_full_id.0,
ModuleReqId(self.requests_awaiting_response.len() as u32),
......@@ -504,7 +505,7 @@ impl WS2PModuleDatas {
pub fn send_request_to_specific_node(
&mut self,
receiver_ws2p_full_id: &NodeFullId,
ws2p_request: &NetworkRequest,
ws2p_request: &OldNetworkRequest,
) -> ws::Result<()> {
self.websockets
.get_mut(receiver_ws2p_full_id)
......
ws2p-v1-legacy/lib.rs
+ 23
− 13
View file @ 77541206
......@@ -147,7 +147,12 @@ pub enum WS2PSignal {
PeerCard(NodeFullId, serde_json::Value, Vec<EndpointEnum>),
Heads(NodeFullId, Vec<NetworkHead>),
Document(NodeFullId, NetworkDocument),
ReqResponse(ModuleReqId, NetworkRequest, NodeFullId, serde_json::Value),
ReqResponse(
ModuleReqId,
OldNetworkRequest,
NodeFullId,
serde_json::Value,
),
Empty,
NoConnection,
}
......@@ -440,8 +445,8 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
}
}
}*/
DursMsgContent::NetworkRequest(ref request) => match *request {
NetworkRequest::GetBlocks(
DursMsgContent::OldNetworkRequest(ref request) => match *request {
OldNetworkRequest::GetBlocks(
ref req_id,
ref receiver,
ref count,
......@@ -478,7 +483,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
let _blocks_request_result = ws2p_module
.send_request_to_specific_node(
&real_receiver,
&NetworkRequest::GetBlocks(
&OldNetworkRequest::GetBlocks(
*req_id, *receiver, *count, *from,
),
);
......@@ -487,13 +492,13 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
let _blocks_request_result = ws2p_module
.send_request_to_specific_node(
&receiver,
&NetworkRequest::GetBlocks(
&OldNetworkRequest::GetBlocks(
*req_id, *receiver, *count, *from,
),
);
}
}
NetworkRequest::GetEndpoints(ref _request) => {}
OldNetworkRequest::GetEndpoints(ref _request) => {}
_ => {}
},
DursMsgContent::DALEvent(ref dal_event) => match *dal_event {
......@@ -637,7 +642,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
let _current_request_result = ws2p_module
.send_request_to_specific_node(
&ws2p_full_id,
&NetworkRequest::GetCurrent(
&OldNetworkRequest::GetCurrent(
ModuleReqFullId(module_id, req_id),
ws2p_full_id,
),
......@@ -748,7 +753,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
}
WS2PSignal::ReqResponse(req_id, req, recipient_full_id, response) => {
match req {
NetworkRequest::GetCurrent(ref _req_id, _receiver) => {
OldNetworkRequest::GetCurrent(ref _req_id, _receiver) => {
info!(
"WS2PSignal::ReceiveCurrent({}, {:?}, {:#?})",
req_id.0, req, response
......@@ -764,7 +769,12 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
);
}
}
NetworkRequest::GetBlocks(ref _req_id, _receiver, _count, from) => {
OldNetworkRequest::GetBlocks(
ref _req_id,
_receiver,
_count,
from,
) => {
info!("WS2PSignal::ReceiveChunk({}, {:?})", req_id.0, req);
if response.is_array() {
let mut chunk = Vec::new();
......@@ -781,7 +791,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
);
}
}
NetworkRequest::GetRequirementsPending(
OldNetworkRequest::GetRequirementsPending(
_req_id,
_receiver,
min_cert,
......@@ -872,7 +882,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
info!("get chunks from all connections...");
let module_id = WS2PModule::name();
let _blocks_request_result =
ws2p_module.send_request_to_all_connections(&NetworkRequest::GetBlocks(
ws2p_module.send_request_to_all_connections(&OldNetworkRequest::GetBlocks(
ModuleReqFullId(module_id, ModuleReqId(0 as u32)),
NodeFullId::default(),
50,
......@@ -889,7 +899,7 @@ impl DuniterModule<DuRsConf, DursMsg> for WS2PModule {
{
/*info!("get pending_identities from all connections...");
let _blocks_request_result = ws2p_module.send_request_to_all_connections(
&NetworkRequest::GetRequirementsPending(ModuleReqId(0 as u32), 5),
&OldNetworkRequest::GetRequirementsPending(ModuleReqId(0 as u32), 5),
);*/
last_identities_request = SystemTime::now();
}
......@@ -1169,7 +1179,7 @@ mod tests {
#[test]
fn ws2p_requests() {
let module_id = WS2PModule::name();
let request = NetworkRequest::GetBlocks(
let request = OldNetworkRequest::GetBlocks(
ModuleReqFullId(module_id, ModuleReqId(58)),
NodeFullId::default(),
50,
......
ws2p-v1-legacy/ws2p_requests.rs
+ 8
− 8
View file @ 77541206
......@@ -3,14 +3,14 @@ extern crate duniter_network;
extern crate serde;
extern crate serde_json;
use duniter_network::NetworkRequest;
use duniter_network::OldNetworkRequest;
pub fn network_request_to_json(request: &NetworkRequest) -> serde_json::Value {
pub fn network_request_to_json(request: &OldNetworkRequest) -> serde_json::Value {
let (request_id, request_type, request_params) = match *request {
NetworkRequest::GetCurrent(ref req_full_id, _receiver) => {
OldNetworkRequest::GetCurrent(ref req_full_id, _receiver) => {
(req_full_id.1, "CURRENT", json!({}))
}
NetworkRequest::GetBlocks(ref req_full_id, _receiver, count, from_mumber) => (
OldNetworkRequest::GetBlocks(ref req_full_id, _receiver, count, from_mumber) => (
req_full_id.1,
"BLOCKS_CHUNK",
json!({
......@@ -18,18 +18,18 @@ pub fn network_request_to_json(request: &NetworkRequest) -> serde_json::Value {
"fromNumber": from_mumber
}),
),
NetworkRequest::GetRequirementsPending(ref req_full_id, _receiver, min_cert) => (
OldNetworkRequest::GetRequirementsPending(ref req_full_id, _receiver, min_cert) => (
req_full_id.1,
"WOT_REQUIREMENTS_OF_PENDING",
json!({ "minCert": min_cert }),
),
NetworkRequest::GetConsensus(_) => {
OldNetworkRequest::GetConsensus(_) => {
panic!("GetConsensus() request must be not convert to json !");
}
NetworkRequest::GetHeadsCache(_) => {
OldNetworkRequest::GetHeadsCache(_) => {
panic!("GetHeadsCache() request must be not convert to json !");
}
NetworkRequest::GetEndpoints(_) => {
OldNetworkRequest::GetEndpoints(_) => {
panic!("GetEndpoints() request must be not convert to json !");
}
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment