From 03c24e4eedc2f95d9d38ddea0ccdd4859d057d54 Mon Sep 17 00:00:00 2001 From: NicolasCantu Date: Thu, 9 Jan 2025 17:27:03 +0100 Subject: [PATCH] Replace Init with Handshake --- src/network.rs | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/network.rs b/src/network.rs index f5f6580..0e888ce 100644 --- a/src/network.rs +++ b/src/network.rs @@ -1,20 +1,17 @@ use std::collections::HashMap; -use aes_gcm::aead::{Aead, Payload}; -use aes_gcm::{Aes256Gcm, KeyInit}; -use anyhow::{Error, Result}; -use js_sys::Date; +use anyhow::Result; use rand::{thread_rng, RngCore}; use serde::{Deserialize, Serialize}; -use serde_json::{Map, Value}; +use serde_json::Value; use sp_client::bitcoin::consensus::serialize; -use sp_client::bitcoin::hex::{DisplayHex, FromHex}; +use sp_client::bitcoin::hex::DisplayHex; use sp_client::bitcoin::{OutPoint, Transaction}; use tsify::Tsify; -use crate::crypto::AAD; use crate::error::AnkError; use crate::pcd::{Member, RoleDefinition}; +use crate::process::Process; use crate::signature::Proof; #[derive(Debug, Serialize, Deserialize, Tsify)] @@ -24,7 +21,7 @@ pub enum AnkFlag { Faucet, Cipher, Commit, - Init, + Handshake, Unknown, } @@ -35,7 +32,7 @@ impl From<&str> for AnkFlag { "Faucet" => Self::Faucet, "Cipher" => Self::Cipher, "Commit" => Self::Commit, - "Init" => Self::Init, + "Handshake" => Self::Handshake, _ => Self::Unknown, } } @@ -54,7 +51,7 @@ impl AnkFlag { 1 => Self::Faucet, 2 => Self::Cipher, 3 => Self::Commit, - 4 => Self::Init, + 4 => Self::Handshake, _ => Self::Unknown, } } @@ -65,7 +62,7 @@ impl AnkFlag { Self::Faucet => "Faucet", Self::Cipher => "Cipher", Self::Commit => "Commit", - Self::Init => "Init", + Self::Handshake => "Handshake", Self::Unknown => "Unknown", } } @@ -173,14 +170,14 @@ impl NewTxMessage { #[derive(Debug, PartialEq, Serialize, Deserialize, Tsify)] #[tsify(into_wasm_abi, from_wasm_abi)] -pub struct InitMessage { +pub struct HandshakeMessage { pub sp_address: String, - pub peers_list: Option, - pub processes_list: Option, + pub peers_list: HashMap, + pub processes_list: HashMap, } -impl InitMessage { - pub fn new(sp_address: String, peers_list: Option, processes_list: Option) -> Self { +impl HandshakeMessage { + pub fn new(sp_address: String, peers_list: HashMap, processes_list: HashMap) -> Self { Self { sp_address, peers_list,