Merge pull request #58 from tonlabs/0.28.9-rc

Release 0.28.9

Author: d3p

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 All notable changes to this project will be documented in this file.
 
+## 0.28.9 Sep 24, 2021
+### Fixed
+- Internal fixes in order to fix building.
+
 ## 0.28.8 Sep 22, 2021
 ### Fixed
 - Build with new version q-server 0.43.0

ton-node-se/poa/parity/ethkey/src/crypto.rs

@@ -160,7 +160,7 @@ pub mod ecies {
 			hasher.update(secret);
 			hasher.update(s1);
 			let d = hasher.finish();
-			&mut dest[written..(written + 32)].copy_from_slice(&d);
+			dest[written..(written + 32)].copy_from_slice(&d);
 			written += 32;
 			ctr += 1;
 		}

ton-node-se/ton_node/src/node_engine/ton_node_engine.rs

@@ -75,7 +75,7 @@ pub struct TonNodeEngine {
     timers: Arc<Mutex<HashMap<TimerToken, TimerHandler>>>,
     requests: Arc<Mutex<HashMap<PeerId, HashMap<u32, RequestCallback>>>>,
 
-    responses: Arc<Mutex<HashMap<NetworkProtocol, ResponseCallback>>>,
+    responses: Arc<Mutex<Vec<(NetworkProtocol, ResponseCallback)>>>,
     is_network_enabled: bool,
     service: Arc<NetworkService>,
     #[cfg(test)]
@@ -250,7 +250,7 @@ impl TonNodeEngine {
             peer_list: Arc::new(Mutex::new(vec![])),
             timers_count: AtomicUsize::new(0),
             timers: Arc::new(Mutex::new(HashMap::new())),
-            responses: Arc::new(Mutex::new(HashMap::new())),
+            responses: Arc::new(Mutex::new(Vec::new())),
             requests: Arc::new(Mutex::new(HashMap::new())),
             #[cfg(test)]
             test_counter_out: Arc::new(Mutex::new(0)),
@@ -412,7 +412,7 @@ impl TonNodeEngine {
                 let request = deserialize::<NetworkProtocol>(&mut &data[4..]);
 
                 let funcs = self.responses.lock().iter()
-                    .filter(|(key, _val)| variant_eq(key.clone(), &request))
+                    .filter(|(key, _val)| variant_eq(key, &request))
                     .map(|(_key, val)| val.clone()).collect::<Vec<ResponseCallback>>();
 
                 if funcs.len() == 1 {
@@ -509,7 +509,7 @@ impl TonNodeEngine {
         responce: NetworkProtocol,
         callback: ResponseCallback)
     {
-        self.responses.lock().insert(responce, callback);
+        self.responses.lock().push((responce, callback));
     }
 
     fn disconnected_internal(&self, io: &dyn NetworkContext, peer: &PeerId ) -> NodeResult<()> {

ton-node-se/ton_node_startup/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "../build/build.rs"
 name = "ton_node_startup"
-version = "0.28.8"
+version = "0.28.9"
 
 [dependencies]
 clap = "2.32.0"