[ref] ws2p: generate peercard in test

lib/modules/ws2p/ws2p/src/generate_peer.rs

@@ -25,6 +25,7 @@ use durs_network_documents::network_endpoint::*;
 use durs_network_documents::network_peer::*;
 use durs_network_documents::*;
 
+/// self peer update endpoints
 pub fn _self_peer_update_endpoints(
     self_peer: PeerCardV11,
     issuer_keys: KeyPairEnum,
@@ -89,6 +90,7 @@ pub fn _self_peer_update_endpoints(
     Ok(new_self_peer)
 }
 
+/// generate peer card
 pub fn _generate_self_peer(
     currency_name: CurrencyName,
     issuer_keys: KeyPairEnum,

lib/modules/ws2p/ws2p/src/lib.rs

@@ -37,7 +37,7 @@ mod conf;
 mod constants;
 pub mod controllers;
 mod errors;
-mod generate_peer;
+pub mod generate_peer;
 mod websocket;
 
 use crate::conf::*;

lib/modules/ws2p/ws2p/tests/connection_negociation.rs

@@ -17,11 +17,14 @@ use dup_crypto::keys::KeyPair;
 use dup_crypto::keys::*;
 use dup_currency_params::CurrencyName;
 //use durs_common_tests_tools::logger::init_logger_stdout;
+use dubp_documents::BlockNumber;
 use durs_message::DursMsg;
 use durs_network_documents::network_endpoint::*;
+use durs_network_documents::network_peer::*;
 use durs_network_documents::*;
 use durs_ws2p::controllers::incoming_connections::*;
 use durs_ws2p::controllers::outgoing_connections::*;
+use durs_ws2p::generate_peer;
 use durs_ws2p_messages::v2::api_features::*;
 use durs_ws2p_messages::v2::connect::WS2Pv2ConnectType;
 use durs_ws2p_protocol::connection_state::WS2PConnectionState;
@@ -54,18 +57,46 @@ pub fn keypair2() -> ed25519::KeyPair {
 }
 
 fn server_node() -> MySelfWs2pNode {
+    // generate peer card
+    let peer_card = if let Ok(peer_card) = generate_peer::_generate_self_peer(
+        CurrencyName("mok".to_string()),
+        KeyPairEnum::Ed25519(keypair1()),
+        NodeId(0),
+        BlockNumber(0),
+        vec![],
+    ) {
+        peer_card
+    } else {
+        panic!("can not sign self peer");
+    };
+
     MySelfWs2pNode {
         my_node_id: NodeId(0),
         my_key_pair: KeyPairEnum::Ed25519(keypair1()),
         my_features: WS2PFeatures(vec![5u8]),
+        my_peer: PeerCard::V11(peer_card),
     }
 }
 
 fn client_node() -> MySelfWs2pNode {
+    // generate peer card
+    let peer_card = if let Ok(peer_card) = generate_peer::_generate_self_peer(
+        CurrencyName("mok".to_string()),
+        KeyPairEnum::Ed25519(keypair2()),
+        NodeId(0),
+        BlockNumber(0),
+        vec![],
+    ) {
+        peer_card
+    } else {
+        panic!("can not sign self peer");
+    };
+
     MySelfWs2pNode {
         my_node_id: NodeId(1),
         my_key_pair: KeyPairEnum::Ed25519(keypair2()),
         my_features: WS2PFeatures(vec![5u8]),
+        my_peer: PeerCard::V11(peer_card),
     }
 }
 
@@ -299,8 +330,10 @@ fn get_controller(
     orchestrator_receiver: &mpsc::Receiver<OrchestratorMsg<DursMsg>>,
 ) -> mpsc::Sender<WebsocketActionOrder> {
     // we must receive controller sender
-    if let Ok(OrchestratorMsg::ControllerSender(controller_sender)) =
-        orchestrator_receiver.recv_timeout(Duration::from_millis(*TIMEOUT_IN_MS))
+    if let Ok(OrchestratorMsg::ControllerSender {
+        id: _,
+        sender: controller_sender,
+    }) = orchestrator_receiver.recv_timeout(Duration::from_millis(*TIMEOUT_IN_MS))
     {
         return controller_sender;
     } else {