migrate to the 2024 edition

Author: haxjump

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chaindev"
-version = "0.53.1"
-edition = "2021"
+version = "0.54.0"
+edition = "2024"
 authors = ["[email protected]"]
 description = "Powerful development and testing utils for blockchain developers."
 homepage = "https://github.com/rust-util-collections/chaindev"
@@ -23,8 +23,8 @@ serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 serde_yml = "0.0.12"
 
-ruc = { version = "7.8.5", features = [ "cmd", "ssh" ] }
-vsdb = { version = "3.0.0", default-features = false }
+ruc = { version = "8.0", features = [ "cmd", "ssh" ] }
+vsdb = { version = "4.0", default-features = false }
 
 tendermint = { version = "0.40", optional = true }
 tendermint-config = { version = "0.40", optional = true }

src/beacon_based/ddev/mod.rs

@@ -7,7 +7,7 @@ pub mod remote;
 use crate::check_errlist;
 use crate::common::{
     hosts::{Host, HostAddr, HostID, HostMeta, Hosts, Weight},
-    remote::{exec_cmds_on_hosts, get_file_from_hosts, put_file_to_hosts, Remote},
+    remote::{Remote, exec_cmds_on_hosts, get_file_from_hosts, put_file_to_hosts},
 };
 use parking_lot::RwLock;
 use rand::random;

src/beacon_based/ddev/remote.rs

@@ -1,11 +1,11 @@
 use crate::{
+    NodeID,
     beacon_based::{
         common::CustomData,
         ddev::{Env, EnvMeta, Node, NodeCmdGenerator, NodePorts},
     },
     check_errlist,
     common::remote::Remote,
-    NodeID,
 };
 use ruc::*;
 use std::collections::BTreeMap;

src/beacon_based/dev.rs

@@ -4,8 +4,8 @@
 
 use nix::{
     sys::socket::{
-        self, setsockopt, socket, sockopt, AddressFamily, SockFlag, SockType,
-        SockaddrIn,
+        self, AddressFamily, SockFlag, SockType, SockaddrIn, setsockopt, socket,
+        sockopt,
     },
     unistd::{self, ForkResult},
 };
@@ -18,7 +18,7 @@ use std::{
     fs::{self, OpenOptions},
     io::{ErrorKind, Write},
     os::unix::io::AsRawFd,
-    process::{exit, Command, Stdio},
+    process::{Command, Stdio, exit},
     sync::LazyLock,
 };
 use vsdb::MapxOrd;
@@ -1028,8 +1028,7 @@ impl<Ports: NodePorts> Node<Ports> {
             } else {
                 println!(
                     "This node(ID {}) may be in a partial failed state, less than 3 live processes({}) detected, enter the restart process.",
-                    self.id,
-                    process_cnt
+                    self.id, process_cnt
                 );
                 // Probably a partial failure
                 self.stop(env, false).c(d!())?;

src/tendermint_based/ddev/mod.rs

@@ -7,7 +7,7 @@ pub mod remote;
 use crate::check_errlist;
 use crate::common::{
     hosts::{HostExpression, HostExpressionRef, HostID, HostMeta, Hosts, Weight},
-    remote::{exec_cmds_on_hosts, get_file_from_hosts, put_file_to_hosts, Remote},
+    remote::{Remote, exec_cmds_on_hosts, get_file_from_hosts, put_file_to_hosts},
 };
 use rand::random;
 use ruc::{cmd, *};
@@ -21,11 +21,11 @@ use std::{
     sync::LazyLock,
     thread,
 };
-use tendermint::{validator::Info as TmValidator, vote::Power as TmPower, Genesis};
+use tendermint::{Genesis, validator::Info as TmValidator, vote::Power as TmPower};
 use tendermint_config::{
     NodeKey, PrivValidatorKey as TmValidatorKey, TendermintConfig as TmConfig,
 };
-use toml_edit::{value as toml_value, Array, DocumentMut as Document};
+use toml_edit::{Array, DocumentMut as Document, value as toml_value};
 use vsdb::MapxOrd;
 
 pub use super::common::*;
@@ -1086,7 +1086,7 @@ where
                 })
                 .map(|key| TmValidator::new(key.pub_key, TmPower::from(PRESET_POWER)))
         };
-        let gen = |genesis_file: String| {
+        let genit = |genesis_file: String| {
             thread::scope(|s| {
                 let hdrs = self
                     .meta
@@ -1141,7 +1141,7 @@ where
                 .map_err(|e| eg!(e))
         })
         .and_then(|cfg| cfg.genesis_file.to_str().map(|f| f.to_owned()).c(d!()))
-        .and_then(gen)
+        .and_then(genit)
         .and_then(|_| fs::remove_dir_all(tmp_home).c(d!()))
     }
 
@@ -1625,9 +1625,11 @@ impl PortsCache {
 
     fn set(&self, ports: &[String]) {
         for p in ports {
-            assert!(unsafe { self.port_set.shadow() }
-                .insert(&p.to_owned(), &())
-                .is_none());
+            assert!(
+                unsafe { self.port_set.shadow() }
+                    .insert(&p.to_owned(), &())
+                    .is_none()
+            );
         }
     }
 

src/tendermint_based/ddev/remote.rs

@@ -1,8 +1,7 @@
 use crate::{
-    check_errlist,
+    NodeID, check_errlist,
     common::remote::Remote,
     tendermint_based::ddev::{Env, EnvMeta, Node, NodeCmdGenerator, NodePorts},
-    NodeID,
 };
 use ruc::*;
 use serde::{Deserialize, Serialize};

src/tendermint_based/dev.rs

@@ -4,8 +4,8 @@
 
 use nix::{
     sys::socket::{
-        self, setsockopt, socket, sockopt, AddressFamily, SockFlag, SockType,
-        SockaddrIn,
+        self, AddressFamily, SockFlag, SockType, SockaddrIn, setsockopt, socket,
+        sockopt,
     },
     unistd::{self, ForkResult},
 };
@@ -20,15 +20,15 @@ use std::{
     io::{ErrorKind, Write},
     os::unix::io::AsRawFd,
     path::PathBuf,
-    process::{exit, Command, Stdio},
+    process::{Command, Stdio, exit},
     str::FromStr,
     sync::LazyLock,
 };
-use tendermint::{validator::Info as TmValidator, vote::Power as TmPower, Genesis};
+use tendermint::{Genesis, validator::Info as TmValidator, vote::Power as TmPower};
 use tendermint_config::{
     PrivValidatorKey as TmValidatorKey, TendermintConfig as TmConfig,
 };
-use toml_edit::{value as toml_value, Array, DocumentMut as Document};
+use toml_edit::{Array, DocumentMut as Document, value as toml_value};
 
 pub use super::common::*;
 use crate::common::NodeCmdGenerator;
@@ -674,7 +674,7 @@ where
         let tmp_id = NodeID::MAX;
         let tmp_home = format!("{}/{}", &self.meta.home, tmp_id);
 
-        let gen = |genesis_file: String| {
+        let genit = |genesis_file: String| {
             self.meta
                 .nodes
                 .values()
@@ -735,7 +735,7 @@ where
                 .map_err(|e| eg!(e))
         })
         .and_then(|cfg| cfg.genesis_file.to_str().map(|f| f.to_owned()).c(d!()))
-        .and_then(gen)
+        .and_then(genit)
         .and_then(|_| fs::remove_dir_all(tmp_home).c(d!()))
     }
 
@@ -859,8 +859,7 @@ impl<P: NodePorts> Node<P> {
             } else {
                 println!(
                     "This node(ID {}) may be in a partial failed state, less than 3 live processes({}) detected, enter the restart process.",
-                    self.id,
-                    process_cnt
+                    self.id, process_cnt
                 );
                 // Probably a partial failure
                 self.stop(env, false).c(d!())?;

tools/fmt.sh

@@ -56,4 +56,4 @@ for file in $(find .. -path "../target" -a -prune \
     echo $file | grep -c '\.md$'>/dev/null || perl -pi -e 's/ +$//g' $file
 done
 
-cargo +nightly fmt
+cargo fmt