Merge pull request MystenLabs#308 from huitseeker/chores

Chores

fastpay/Cargo.toml

@@ -7,18 +7,18 @@ publish = false
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.52"
+anyhow = "1.0.53"
 bytes = "1.1.0"
-clap = "2"
+clap = "3.0.13"
 env_logger = "0.9.0"
-futures = "0.3.5"
+futures = "0.3.19"
 log = "0.4.14"
 net2 = "0.2.37"
-serde = { version = "1.0.133", features = ["derive"] }
-serde_json = "1.0.74"
-structopt = "0.3.25"
+serde = { version = "1.0.136", features = ["derive"] }
+serde_json = "1.0.78"
+structopt = "0.3.26"
 tempfile = "3.3.0"
-tokio = { version = "1.15.0", features = ["full"] }
+tokio = { version = "1.16.1", features = ["full"] }
 rand = "0.8.4"
 toml = "0.5.8"
 strum = "0.23.0"

fastpay/src/transport.rs

@@ -49,12 +49,12 @@ pub async fn connect(
     address: String,
     max_data_size: usize,
 ) -> Result<TcpDataStream, std::io::Error> {
-    Ok(TcpDataStream::connect(address, max_data_size).await?)
+    TcpDataStream::connect(address, max_data_size).await
 }
 
 /// Create a DataStreamPool for this protocol.
 pub async fn make_outgoing_connection_pool() -> Result<TcpDataStreamPool, std::io::Error> {
-    Ok(TcpDataStreamPool::new().await?)
+    TcpDataStreamPool::new().await
 }
 
 /// Run a server for this protocol and the given message handler.

fastpay/tests/readme.rs

@@ -14,7 +14,7 @@ fn test_examples_in_readme() -> std::io::Result<()> {
     assert_eq!(quotes.len(), 1);
 
     let mut test_script = std::fs::File::create(dir.path().join("test.sh"))?;
-    write!(&mut test_script, "{}", quotes.pop().unwrap())?;
+    write!(test_script, "{}", quotes.pop().unwrap())?;
 
     let status = Command::new("bash")
         .current_dir("..") // root of the repo

fastpay_core/Cargo.toml

@@ -8,13 +8,13 @@ edition = "2021"
 
 [dependencies]
 rocksdb = "0.17.0"
-anyhow = "1.0.52"
+anyhow = "1.0.53"
 bcs = "0.1.3"
-futures = "0.3.5"
+futures = "0.3.19"
 rand = "0.7.3"
-serde = { version = "1.0.133", features = ["derive"] }
-tokio = { version = "1.15.0", features = ["full"] }
-parking_lot = "0.11.2"
+serde = { version = "1.0.136", features = ["derive"] }
+tokio = { version = "1.16.1", features = ["full"] }
+parking_lot = "0.12.0"
 itertools = "0.10.3"
 async-trait = "0.1.52"
 tempfile = "3.3.0"

fastx_programmability/adapter/Cargo.toml

@@ -8,10 +8,10 @@ publish = false
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.52"
+anyhow = "1.0.53"
 bcs = "0.1.3"
 once_cell = "1.9.0"
-structopt = "0.3.25"
+structopt = "0.3.26"
 
 move-binary-format = { git = "https://github.com/diem/move", rev="62b5a5075378ae6a7102bbfc1fb33b57ba6125d2" }
 move-bytecode-utils = { git = "https://github.com/diem/move", rev="62b5a5075378ae6a7102bbfc1fb33b57ba6125d2" }

fastx_programmability/adapter/src/adapter.rs

@@ -269,7 +269,7 @@ pub fn verify_and_link<
 /// to reflect the new ID's of its dependencies.
 /// Returns the newly created package ID.
 pub fn generate_package_id(
-    modules: &mut Vec<CompiledModule>,
+    modules: &mut [CompiledModule],
     ctx: &mut TxContext,
 ) -> Result<ObjectID, FastPayError> {
     let mut sub_map = BTreeMap::new();

fastx_programmability/framework/Cargo.toml

@@ -8,8 +8,8 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-anyhow = "1.0.52"
-smallvec = "1.7.0"
+anyhow = "1.0.53"
+smallvec = "1.8.0"
 num_enum = "0.5.6"
 
 fastx-types = { path = "../../fastx_types" }
@@ -27,4 +27,4 @@ move-vm-types = { git = "https://github.com/diem/move", rev="62b5a5075378ae6a710
 
 
 [package.metadata.cargo-udeps.ignore]
-normal = ["move-cli", "move-unit-test"]
+normal = ["move-cli", "move-unit-test"]

fastx_programmability/verifier/Cargo.toml

@@ -12,4 +12,4 @@ move-binary-format = { git = "https://github.com/diem/move", rev="62b5a5075378ae
 move-bytecode-verifier = { git = "https://github.com/diem/move", rev="62b5a5075378ae6a7102bbfc1fb33b57ba6125d2" }
 move-core-types = { git = "https://github.com/diem/move", rev="62b5a5075378ae6a7102bbfc1fb33b57ba6125d2", features=["address20"] }
 
-fastx-types = { path = "../../fastx_types" }
+fastx-types = { path = "../../fastx_types" }

fastx_types/Cargo.toml

@@ -7,12 +7,12 @@ publish = false
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.52"
+anyhow = "1.0.53"
 base64 = "0.13.0"
 bcs = "0.1.3"
 bincode = "1.3.3"
 rand = "0.7.3"
-serde = { version = "1.0.133", features = ["derive"] }
+serde = { version = "1.0.136", features = ["derive"] }
 ed25519 = "1.3.0"
 ed25519-dalek = { version = "1.0.1", features = ["batch", "serde"] }
 serde-name = "0.2.0"
@@ -21,7 +21,7 @@ thiserror = "1.0.30"
 hex = "0.4.3"
 serde_bytes = "0.11.5"
 serde_with = "1.11.0"
-static_assertions = "0.3.4"
+static_assertions = "1.1.0"
 
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "232c44e88e69eb54fe80dab247adcd1b643aeb8c" }
 

fastx_types/src/messages.rs

@@ -101,7 +101,7 @@ pub struct CertifiedOrder {
 //
 // see also https://github.com/MystenLabs/fastnft/issues/266
 //
-static_assertions::assert_not_impl_any!(idem_orders; CertifiedOrder, Hash, Eq, PartialEq);
+static_assertions::assert_not_impl_any!(CertifiedOrder: Hash, Eq, PartialEq);
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ConfirmationOrder {