diff --git a/bee-api/bee-rest-api/Cargo.toml b/bee-api/bee-rest-api/Cargo.toml index 73c49fff27..add7542a2e 100644 --- a/bee-api/bee-rest-api/Cargo.toml +++ b/bee-api/bee-rest-api/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-rest-api" version = "0.1.3" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "The default REST API implementation for the IOTA Bee node software." readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-api/bee-rest-api/src/types/dtos.rs b/bee-api/bee-rest-api/src/types/dtos.rs index 8d1b641428..7e494e4392 100644 --- a/bee-api/bee-rest-api/src/types/dtos.rs +++ b/bee-api/bee-rest-api/src/types/dtos.rs @@ -31,8 +31,6 @@ use bee_protocol::types::peer::Peer; use serde::{Deserialize, Serialize, Serializer}; use serde_json::Value; -use std::convert::{TryFrom, TryInto}; - /// The message object that nodes gossip around in the network. #[derive(Clone, Debug, Serialize, Deserialize)] pub struct MessageDto { diff --git a/bee-common/bee-common-derive/Cargo.toml b/bee-common/bee-common-derive/Cargo.toml index dd9f3ddf26..2e015e28ac 100644 --- a/bee-common/bee-common-derive/Cargo.toml +++ b/bee-common/bee-common-derive/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-common-derive" version = "0.1.1-alpha" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Derive macros for the bee-common crate" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-common/bee-common/Cargo.toml b/bee-common/bee-common/Cargo.toml index 6c6f3f134b..eeba3f0a7f 100644 --- a/bee-common/bee-common/Cargo.toml +++ b/bee-common/bee-common/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-common" version = "0.5.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Common utilities used across the bee framework" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-crypto/Cargo.toml b/bee-crypto/Cargo.toml index 62da6c805f..090cfd78f6 100644 --- a/bee-crypto/Cargo.toml +++ b/bee-crypto/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-crypto" version = "0.2.1-alpha" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Cryptographic primitives of the IOTA protocol" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-crypto/src/ternary/bigint/i384/mod.rs b/bee-crypto/src/ternary/bigint/i384/mod.rs index 9693f93a25..91975d141c 100644 --- a/bee-crypto/src/ternary/bigint/i384/mod.rs +++ b/bee-crypto/src/ternary/bigint/i384/mod.rs @@ -27,7 +27,6 @@ use byteorder::{self, ByteOrder}; use std::{ cmp::Ordering, - convert::{TryFrom, TryInto}, fmt, marker::PhantomData, ops::{Deref, DerefMut}, diff --git a/bee-crypto/src/ternary/bigint/t242/mod.rs b/bee-crypto/src/ternary/bigint/t242/mod.rs index 15c901f9a3..1c854631ab 100644 --- a/bee-crypto/src/ternary/bigint/t242/mod.rs +++ b/bee-crypto/src/ternary/bigint/t242/mod.rs @@ -24,10 +24,7 @@ use crate::ternary::bigint::{ use bee_ternary::{Btrit, ShiftTernary, T1B1Buf, Trit, TritBuf, Utrit}; -use std::{ - cmp::Ordering, - convert::{TryFrom, TryInto}, -}; +use std::cmp::Ordering; def_and_impl_ternary!(T242, 242); diff --git a/bee-crypto/src/ternary/bigint/u384/constants.rs b/bee-crypto/src/ternary/bigint/u384/constants.rs index 0f3b577c94..5d5cca99a2 100644 --- a/bee-crypto/src/ternary/bigint/u384/constants.rs +++ b/bee-crypto/src/ternary/bigint/u384/constants.rs @@ -13,8 +13,6 @@ use bee_ternary::Utrit; use lazy_static::lazy_static; -use std::convert::TryFrom; - lazy_static! { /// U384 big-endian `u32` represented half of maximum value. pub static ref BE_U32_HALF_MAX: U384 = (*LE_U32_HALF_MAX).into(); diff --git a/bee-crypto/src/ternary/bigint/u384/mod.rs b/bee-crypto/src/ternary/bigint/u384/mod.rs index 52d6ebdaa0..b04edddf52 100644 --- a/bee-crypto/src/ternary/bigint/u384/mod.rs +++ b/bee-crypto/src/ternary/bigint/u384/mod.rs @@ -26,7 +26,6 @@ use byteorder::{self, ByteOrder}; use std::{ cmp::Ordering, - convert::TryFrom, fmt, marker::PhantomData, ops::{Deref, DerefMut}, diff --git a/bee-crypto/src/ternary/hash.rs b/bee-crypto/src/ternary/hash.rs index 63d449be79..e118f5e3d9 100644 --- a/bee-crypto/src/ternary/hash.rs +++ b/bee-crypto/src/ternary/hash.rs @@ -5,7 +5,6 @@ use bee_ternary::{raw::RawEncoding, Btrit, Trits, T1B1}; use std::{ cmp::PartialEq, - convert::TryFrom, fmt, hash, ops::{Deref, DerefMut}, }; diff --git a/bee-crypto/tests/binary_to_ternary_roundtrip.rs b/bee-crypto/tests/binary_to_ternary_roundtrip.rs index 16a713400b..abe5bf2fd1 100644 --- a/bee-crypto/tests/binary_to_ternary_roundtrip.rs +++ b/bee-crypto/tests/binary_to_ternary_roundtrip.rs @@ -4,8 +4,6 @@ use bee_crypto::ternary::bigint::{binary_representation::U32Repr, endianness::LittleEndian, I384, T243, U384}; use bee_ternary::{Btrit, Utrit}; -use std::convert::TryInto; - macro_rules! binary_to_ternary_roundtrip { ( ( $($binary_type:tt)* ), ( $($ternary_type:tt)* ), $testname:ident, $val_fn:ident ) => { #[test] diff --git a/bee-crypto/tests/ternary_to_binary_roundtrip.rs b/bee-crypto/tests/ternary_to_binary_roundtrip.rs index b186d5a09c..4c450d1b4b 100644 --- a/bee-crypto/tests/ternary_to_binary_roundtrip.rs +++ b/bee-crypto/tests/ternary_to_binary_roundtrip.rs @@ -4,8 +4,6 @@ use bee_crypto::ternary::bigint::{binary_representation::U32Repr, endianness::LittleEndian, I384, T242, T243, U384}; use bee_ternary::{Btrit, Utrit}; -use std::convert::TryInto; - #[test] fn t243_max_exceeds_u384_range() { let t243_max = T243::::max(); diff --git a/bee-crypto/tests/trytes_to_bigint.rs b/bee-crypto/tests/trytes_to_bigint.rs index c9353eab00..1baf46db8f 100644 --- a/bee-crypto/tests/trytes_to_bigint.rs +++ b/bee-crypto/tests/trytes_to_bigint.rs @@ -4,8 +4,6 @@ use bee_crypto::ternary::bigint::{binary_representation::U8Repr, endianness::BigEndian, I384, T243}; use bee_ternary::{T1B1Buf, TritBuf, TryteBuf}; -use std::convert::TryFrom; - #[test] fn trytes_to_i384_be_u8_1() { const INPUT_TRYTES: &str = "EMIDYNHBWMBCXVDEFOFWINXTERALUKYYPPHKP9JJFGJEIUY9MUDVNFZHMMWZUYUSWAIOWEVTHNWMHANBH"; diff --git a/bee-ledger/Cargo.toml b/bee-ledger/Cargo.toml index 6684b6f5c0..144a8ea526 100644 --- a/bee-ledger/Cargo.toml +++ b/bee-ledger/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-ledger" version = "0.5.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "All types and features required to compute and maintain the ledger state" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-ledger/src/workers/consensus/worker.rs b/bee-ledger/src/workers/consensus/worker.rs index 5e79a622f3..6af2991109 100644 --- a/bee-ledger/src/workers/consensus/worker.rs +++ b/bee-ledger/src/workers/consensus/worker.rs @@ -29,7 +29,7 @@ use log::{debug, error, info, warn}; use tokio::sync::mpsc; use tokio_stream::wrappers::UnboundedReceiverStream; -use std::{any::TypeId, convert::TryInto}; +use std::any::TypeId; pub(crate) const EXTRA_SNAPSHOT_DEPTH: u32 = 5; pub(crate) const EXTRA_PRUNING_DEPTH: u32 = 5; diff --git a/bee-message/Cargo.toml b/bee-message/Cargo.toml index e4a2a8ef01..86b7b20545 100644 --- a/bee-message/Cargo.toml +++ b/bee-message/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-message" version = "0.1.5" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Implementation of the IOTA protocol message layouts" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-message/fuzz/Cargo.toml b/bee-message/fuzz/Cargo.toml index d8df2810b7..ef5435f3b3 100644 --- a/bee-message/fuzz/Cargo.toml +++ b/bee-message/fuzz/Cargo.toml @@ -3,7 +3,7 @@ name = "bee-message-fuzz" version = "0.0.0" authors = [ "Automatically generated" ] publish = false -edition = "2018" +edition = "2021" [package.metadata] cargo-fuzz = true diff --git a/bee-message/src/address/ed25519.rs b/bee-message/src/address/ed25519.rs index 8ecd3270e6..e505698aae 100644 --- a/bee-message/src/address/ed25519.rs +++ b/bee-message/src/address/ed25519.rs @@ -10,7 +10,7 @@ use crypto::{ signatures::ed25519::{PublicKey, Signature}, }; -use core::{convert::TryInto, str::FromStr}; +use core::str::FromStr; /// The number of bytes in an Ed25519 address. /// See for more information. diff --git a/bee-message/src/address/mod.rs b/bee-message/src/address/mod.rs index 5b188df672..754d47651e 100644 --- a/bee-message/src/address/mod.rs +++ b/bee-message/src/address/mod.rs @@ -12,7 +12,6 @@ use bee_common::packable::{Packable, Read, Write}; use bech32::{self, FromBase32, ToBase32, Variant}; use alloc::{str::FromStr, string::String}; -use core::convert::TryFrom; /// A generic address supporting different address kinds. #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] diff --git a/bee-message/src/message_id.rs b/bee-message/src/message_id.rs index f059c51121..1b869da03f 100644 --- a/bee-message/src/message_id.rs +++ b/bee-message/src/message_id.rs @@ -5,7 +5,7 @@ use crate::Error; use bee_common::packable::{Packable, Read, Write}; -use core::{convert::TryInto, str::FromStr}; +use core::str::FromStr; /// The length of a message identifier. pub const MESSAGE_ID_LENGTH: usize = 32; diff --git a/bee-message/src/output/output_id.rs b/bee-message/src/output/output_id.rs index 4b16124422..3826b17cfa 100644 --- a/bee-message/src/output/output_id.rs +++ b/bee-message/src/output/output_id.rs @@ -9,10 +9,7 @@ use crate::{ use bee_common::packable::{Packable, Read, Write}; -use core::{ - convert::{From, TryFrom, TryInto}, - str::FromStr, -}; +use core::str::FromStr; /// The length of an `OutputId`. pub const OUTPUT_ID_LENGTH: usize = TRANSACTION_ID_LENGTH + std::mem::size_of::(); diff --git a/bee-message/src/payload/milestone/milestone_id.rs b/bee-message/src/payload/milestone/milestone_id.rs index f4af228a9c..43f70ae694 100644 --- a/bee-message/src/payload/milestone/milestone_id.rs +++ b/bee-message/src/payload/milestone/milestone_id.rs @@ -5,7 +5,7 @@ use crate::Error; use bee_common::packable::{Packable, Read, Write}; -use core::{convert::TryInto, str::FromStr}; +use core::str::FromStr; /// The length of a milestone identifier. pub const MILESTONE_ID_LENGTH: usize = 32; diff --git a/bee-message/src/payload/milestone/mod.rs b/bee-message/src/payload/milestone/mod.rs index 27d04d757c..ba6ca69a15 100644 --- a/bee-message/src/payload/milestone/mod.rs +++ b/bee-message/src/payload/milestone/mod.rs @@ -20,7 +20,7 @@ use crypto::{ }; use alloc::{boxed::Box, vec::Vec}; -use core::{convert::TryInto, ops::RangeInclusive}; +use core::ops::RangeInclusive; /// Range of allowed milestones signatures key numbers. pub const MILESTONE_SIGNATURE_COUNT_RANGE: RangeInclusive = 1..=255; diff --git a/bee-message/src/payload/receipt/tail_transaction_hash.rs b/bee-message/src/payload/receipt/tail_transaction_hash.rs index da511b74f3..96c2057f79 100644 --- a/bee-message/src/payload/receipt/tail_transaction_hash.rs +++ b/bee-message/src/payload/receipt/tail_transaction_hash.rs @@ -8,8 +8,6 @@ use bee_ternary::{T5B1Buf, TritBuf, Trits, T5B1}; use bytemuck::cast_slice; -use core::convert::{TryFrom, TryInto}; - /// The length of a tail transaction hash. pub const TAIL_TRANSACTION_HASH_LEN: usize = 49; diff --git a/bee-message/src/payload/transaction/transaction_id.rs b/bee-message/src/payload/transaction/transaction_id.rs index 4720849a69..a1096f34b1 100644 --- a/bee-message/src/payload/transaction/transaction_id.rs +++ b/bee-message/src/payload/transaction/transaction_id.rs @@ -5,7 +5,7 @@ use crate::Error; use bee_common::packable::{Packable, Read, Write}; -use core::{convert::TryInto, str::FromStr}; +use core::str::FromStr; /// The length of a transaction identifier. pub const TRANSACTION_ID_LENGTH: usize = 32; diff --git a/bee-message/src/unlock/reference.rs b/bee-message/src/unlock/reference.rs index a14a216a87..55aa82f5dc 100644 --- a/bee-message/src/unlock/reference.rs +++ b/bee-message/src/unlock/reference.rs @@ -5,8 +5,6 @@ use crate::{constants::INPUT_OUTPUT_INDEX_RANGE, Error}; use bee_common::packable::{Packable, Read, Write}; -use core::convert::TryFrom; - /// An [`UnlockBlock`](crate::unlock::UnlockBlock) that refers to another unlock block. #[derive(Clone, Debug, Eq, PartialEq, Hash)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] diff --git a/bee-message/tests/address.rs b/bee-message/tests/address.rs index b65cee2c63..80cc0f8531 100644 --- a/bee-message/tests/address.rs +++ b/bee-message/tests/address.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::convert::TryInto; - const ED25519_ADDRESS: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_ADDRESS_BAD: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c64x"; diff --git a/bee-message/tests/ed25519_address.rs b/bee-message/tests/ed25519_address.rs index f5c66eff93..0f925f8279 100644 --- a/bee-message/tests/ed25519_address.rs +++ b/bee-message/tests/ed25519_address.rs @@ -4,7 +4,7 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::{convert::TryInto, str::FromStr}; +use core::str::FromStr; const ED25519_ADDRESS: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_ADDRESS_INVALID_HEX: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c64x"; diff --git a/bee-message/tests/ed25519_signature.rs b/bee-message/tests/ed25519_signature.rs index 28030a1a49..30bd4095c6 100644 --- a/bee-message/tests/ed25519_signature.rs +++ b/bee-message/tests/ed25519_signature.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::convert::TryInto; - const ED25519_PUBLIC_KEY: &str = "1da5ddd11ba3f961acab68fafee3177d039875eaa94ac5fdbff8b53f0c50bfb9"; const ED25519_SIGNATURE: &str = "c6a40edf9a089f42c18f4ebccb35fe4b578d93b879e99b87f63573324a710d3456b03fb6d1fcc027e6401cbd9581f790ee3ed7a3f68e9c225fcb9f1cd7b7110d"; diff --git a/bee-message/tests/indexation_payload.rs b/bee-message/tests/indexation_payload.rs index 82f6130411..243de99c68 100644 --- a/bee-message/tests/indexation_payload.rs +++ b/bee-message/tests/indexation_payload.rs @@ -5,8 +5,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; use bee_test::rand::bytes::{rand_bytes, rand_bytes_32}; -use std::convert::TryInto; - const PADDED_INDEX: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c64952fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; #[test] diff --git a/bee-message/tests/milestone_id.rs b/bee-message/tests/milestone_id.rs index eccd0473eb..453d142393 100644 --- a/bee-message/tests/milestone_id.rs +++ b/bee-message/tests/milestone_id.rs @@ -5,7 +5,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; use core::str::FromStr; -use std::convert::TryInto; const MILESTONE_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const MILESTONE_ID_INVALID_HEX: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c64x"; diff --git a/bee-message/tests/output_id.rs b/bee-message/tests/output_id.rs index 7d9d1e0c1f..e0fc646b8e 100644 --- a/bee-message/tests/output_id.rs +++ b/bee-message/tests/output_id.rs @@ -4,10 +4,7 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::{ - convert::{TryFrom, TryInto}, - str::FromStr, -}; +use core::str::FromStr; const TRANSACTION_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const OUTPUT_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c6492a00"; diff --git a/bee-message/tests/payload.rs b/bee-message/tests/payload.rs index 0d4e9f43eb..44eb02f8de 100644 --- a/bee-message/tests/payload.rs +++ b/bee-message/tests/payload.rs @@ -5,7 +5,7 @@ use bee_common::packable::Packable; use bee_message::prelude::*; use bee_test::rand::{bytes::rand_bytes_32, parents::rand_parents}; -use std::{convert::TryInto, str::FromStr}; +use std::str::FromStr; const TRANSACTION_ID: &str = "24a1f46bdb6b2bf38f1c59f73cdd4ae5b418804bb231d76d06fbf246498d5883"; const ED25519_ADDRESS: &str = "e594f9a895c0e0a6760dd12cffc2c3d1e1cbf7269b328091f96ce3d0dd550b75"; diff --git a/bee-message/tests/reference_unlock.rs b/bee-message/tests/reference_unlock.rs index cb1cbf994d..5e4fee8485 100644 --- a/bee-message/tests/reference_unlock.rs +++ b/bee-message/tests/reference_unlock.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::convert::TryFrom; - #[test] fn kind() { assert_eq!(ReferenceUnlock::KIND, 1); diff --git a/bee-message/tests/signature_unlock.rs b/bee-message/tests/signature_unlock.rs index b57c070596..0de4cacc0d 100644 --- a/bee-message/tests/signature_unlock.rs +++ b/bee-message/tests/signature_unlock.rs @@ -5,8 +5,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; use bee_test::rand::bytes::{rand_bytes, rand_bytes_32}; -use std::convert::TryInto; - #[test] fn unlock_kind() { assert_eq!(SignatureUnlock::KIND, 0); diff --git a/bee-message/tests/tail_transaction_hash.rs b/bee-message/tests/tail_transaction_hash.rs index ebea5fcbe9..4583bfc5f0 100644 --- a/bee-message/tests/tail_transaction_hash.rs +++ b/bee-message/tests/tail_transaction_hash.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use core::convert::TryFrom; - const HASH_TRYTES: &str = "TZTXLMTAURX9DYQICXZEUMCDBPNXVOHNBBZDSSVCNCTWKSMUALAYPMHUCKGOGSTBUHSQIMSY9HQEP9AXJ"; const HASH_BYTES: [u8; 49] = [ 222, 235, 107, 67, 2, 173, 253, 93, 165, 90, 166, 45, 102, 91, 19, 137, 71, 146, 156, 180, 248, 31, 56, 25, 68, diff --git a/bee-message/tests/transaction_essence.rs b/bee-message/tests/transaction_essence.rs index c9b4ec9da9..520f1bbc0b 100644 --- a/bee-message/tests/transaction_essence.rs +++ b/bee-message/tests/transaction_essence.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::prelude::*; -use std::convert::TryInto; - const TRANSACTION_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_ADDRESS: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; diff --git a/bee-message/tests/transaction_payload.rs b/bee-message/tests/transaction_payload.rs index 2ccd36e5af..a16e75cd7c 100644 --- a/bee-message/tests/transaction_payload.rs +++ b/bee-message/tests/transaction_payload.rs @@ -4,8 +4,6 @@ use bee_common::packable::Packable; use bee_message::{input::Input, payload::transaction::Essence, prelude::*}; -use core::convert::TryInto; - const TRANSACTION_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_ADDRESS: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_PUBLIC_KEY: &str = "1da5ddd11ba3f961acab68fafee3177d039875eaa94ac5fdbff8b53f0c50bfb9"; diff --git a/bee-message/tests/transaction_regular_essence.rs b/bee-message/tests/transaction_regular_essence.rs index 621a8c17d7..34024ad321 100644 --- a/bee-message/tests/transaction_regular_essence.rs +++ b/bee-message/tests/transaction_regular_essence.rs @@ -7,8 +7,6 @@ use bee_test::rand::{ payload::{rand_indexation_payload, rand_treasury_transaction_payload}, }; -use std::convert::TryInto; - const TRANSACTION_ID: &str = "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649"; const ED25519_ADDRESS_1: &str = "d56da1eb7726ed482dfe9d457cf548c2ae2a6ce3e053dbf82f11223be476adb9"; const ED25519_ADDRESS_2: &str = "efda4275375ac3675abff85235fd25a1522a2044cc6027a31b310857246f18c0"; diff --git a/bee-message/tests/unlock_blocks.rs b/bee-message/tests/unlock_blocks.rs index e5ef0a096a..09682da975 100644 --- a/bee-message/tests/unlock_blocks.rs +++ b/bee-message/tests/unlock_blocks.rs @@ -4,8 +4,6 @@ use bee_message::prelude::*; use bee_test::rand::bytes::{rand_bytes, rand_bytes_32}; -use core::convert::TryInto; - #[test] fn kind() { assert_eq!( diff --git a/bee-network/Cargo.toml b/bee-network/Cargo.toml index 1a3981347c..3e7f228822 100644 --- a/bee-network/Cargo.toml +++ b/bee-network/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-network" version = "0.2.2" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = """ Networking functionality and types for nodes and clients participating in the IOTA protocol built on top of `libp2p`. """ diff --git a/bee-pow/Cargo.toml b/bee-pow/Cargo.toml index f76ae733c8..1e9eb8d0e5 100644 --- a/bee-pow/Cargo.toml +++ b/bee-pow/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-pow" version = "0.1.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Provides Proof of Work utilities for the IOTA protocol" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-protocol/Cargo.toml b/bee-protocol/Cargo.toml index 9f7e461f12..36c0de4bf7 100644 --- a/bee-protocol/Cargo.toml +++ b/bee-protocol/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-protocol" version = "0.1.1" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "All types and workers enabling the IOTA protocol" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-runtime/Cargo.toml b/bee-runtime/Cargo.toml index 063c6a49a1..7c477e9b08 100644 --- a/bee-runtime/Cargo.toml +++ b/bee-runtime/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-runtime" version = "0.1.1-alpha" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Runtime components and utilities for the bee framework" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-signing/Cargo.toml b/bee-signing/Cargo.toml index 2b0ddc8f41..ef1419bc3e 100644 --- a/bee-signing/Cargo.toml +++ b/bee-signing/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-signing" version = "0.1.1-alpha" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "IOTA signing primitives" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-signing/src/ternary/wots/mod.rs b/bee-signing/src/ternary/wots/mod.rs index e1658ed024..7f4e8fa826 100644 --- a/bee-signing/src/ternary/wots/mod.rs +++ b/bee-signing/src/ternary/wots/mod.rs @@ -22,7 +22,6 @@ use thiserror::Error; use zeroize::Zeroize; use std::{ - convert::TryFrom, fmt::{self, Display, Formatter}, marker::PhantomData, }; diff --git a/bee-signing/src/ternary/wots/normalize.rs b/bee-signing/src/ternary/wots/normalize.rs index 60c2d26e4a..cdbae76d2e 100644 --- a/bee-signing/src/ternary/wots/normalize.rs +++ b/bee-signing/src/ternary/wots/normalize.rs @@ -8,8 +8,6 @@ use bee_ternary::{T1B1Buf, T3B1Buf, TritBuf, Trits, Tryte, T1B1, T3B1}; use thiserror::Error; -use std::convert::TryFrom; - /// Errors occuring during normalization. #[derive(Debug, Error, PartialEq)] pub enum Error { diff --git a/bee-storage/bee-storage-null/Cargo.toml b/bee-storage/bee-storage-null/Cargo.toml index 99f87583c0..7321c4a973 100644 --- a/bee-storage/bee-storage-null/Cargo.toml +++ b/bee-storage/bee-storage-null/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-storage-null" version = "0.1.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A bee-storage implementation with no backend, for testing purposes" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-storage/bee-storage-rocksdb/Cargo.toml b/bee-storage/bee-storage-rocksdb/Cargo.toml index a908df05ab..41a4812598 100644 --- a/bee-storage/bee-storage-rocksdb/Cargo.toml +++ b/bee-storage/bee-storage-rocksdb/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-storage-rocksdb" version = "0.5.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A bee-storage implementation for the RocksDB backend" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-storage/bee-storage-rocksdb/src/access/fetch.rs b/bee-storage/bee-storage-rocksdb/src/access/fetch.rs index f17a315b0a..f21f9eb418 100644 --- a/bee-storage/bee-storage-rocksdb/src/access/fetch.rs +++ b/bee-storage/bee-storage-rocksdb/src/access/fetch.rs @@ -23,8 +23,6 @@ use bee_tangle::{ metadata::MessageMetadata, solid_entry_point::SolidEntryPoint, unreferenced_message::UnreferencedMessage, }; -use std::convert::{TryFrom, TryInto}; - impl Fetch for Storage { fn fetch(&self, key: &u8) -> Result, ::Error> { Ok(self diff --git a/bee-storage/bee-storage-rocksdb/src/access/iter.rs b/bee-storage/bee-storage-rocksdb/src/access/iter.rs index f35c631627..a629a449a7 100644 --- a/bee-storage/bee-storage-rocksdb/src/access/iter.rs +++ b/bee-storage/bee-storage-rocksdb/src/access/iter.rs @@ -25,7 +25,7 @@ use bee_tangle::{ use rocksdb::{DBIterator, IteratorMode}; -use std::{convert::TryInto, marker::PhantomData}; +use std::marker::PhantomData; pub struct StorageIterator<'a, K, V> { inner: DBIterator<'a>, diff --git a/bee-storage/bee-storage-sled/Cargo.toml b/bee-storage/bee-storage-sled/Cargo.toml index 8156fbb94b..8fda9c90b2 100644 --- a/bee-storage/bee-storage-sled/Cargo.toml +++ b/bee-storage/bee-storage-sled/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-storage-sled" version = "0.4.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A bee-storage implementation for the Sled backend" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-storage/bee-storage-sled/src/access/fetch.rs b/bee-storage/bee-storage-sled/src/access/fetch.rs index b555164bab..8e97cff85d 100644 --- a/bee-storage/bee-storage-sled/src/access/fetch.rs +++ b/bee-storage/bee-storage-sled/src/access/fetch.rs @@ -22,8 +22,6 @@ use bee_tangle::{ metadata::MessageMetadata, solid_entry_point::SolidEntryPoint, unreferenced_message::UnreferencedMessage, }; -use std::convert::{TryFrom, TryInto}; - impl Fetch for Storage { fn fetch(&self, &key: &u8) -> Result, ::Error> { Ok(self diff --git a/bee-storage/bee-storage-sled/src/access/iter.rs b/bee-storage/bee-storage-sled/src/access/iter.rs index dda9f38c8b..5145cbba5c 100644 --- a/bee-storage/bee-storage-sled/src/access/iter.rs +++ b/bee-storage/bee-storage-sled/src/access/iter.rs @@ -22,7 +22,7 @@ use bee_tangle::{ metadata::MessageMetadata, solid_entry_point::SolidEntryPoint, unreferenced_message::UnreferencedMessage, }; -use std::{convert::TryInto, marker::PhantomData}; +use std::marker::PhantomData; /// Type used to iterate a subtree. pub struct StorageIterator<'a, K, V> { diff --git a/bee-storage/bee-storage-test/Cargo.toml b/bee-storage/bee-storage-test/Cargo.toml index debb267110..f106ae1bdf 100644 --- a/bee-storage/bee-storage-test/Cargo.toml +++ b/bee-storage/bee-storage-test/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-storage-test" version = "0.3.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A crate to test storage implementation in a generic way" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-storage/bee-storage/Cargo.toml b/bee-storage/bee-storage/Cargo.toml index fdb46a909a..e239c10ddd 100644 --- a/bee-storage/bee-storage/Cargo.toml +++ b/bee-storage/bee-storage/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-storage" version = "0.9.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A general purpose storage backend crate with key value abstraction API" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-tangle/Cargo.toml b/bee-tangle/Cargo.toml index 67876a1cda..3fa9c810cb 100644 --- a/bee-tangle/Cargo.toml +++ b/bee-tangle/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-tangle" version = "0.2.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "A distributed, directed, acyclic graph that underpins the DLT for IOTA's Bee node" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-tangle/src/conflict.rs b/bee-tangle/src/conflict.rs index 2d3d08f4e7..44c4e15980 100644 --- a/bee-tangle/src/conflict.rs +++ b/bee-tangle/src/conflict.rs @@ -5,10 +5,7 @@ use bee_common::packable::Packable; use serde::{Deserialize, Serialize}; -use std::{ - convert::{TryFrom, TryInto}, - io::{Read, Write}, -}; +use std::io::{Read, Write}; /// Errors related to ledger types. #[derive(Debug, thiserror::Error)] diff --git a/bee-ternary/Cargo.toml b/bee-ternary/Cargo.toml index ed9b94be3d..d741f8ca06 100644 --- a/bee-ternary/Cargo.toml +++ b/bee-ternary/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-ternary" version = "0.5.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Ergonomic ternary manipulation utilities" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-ternary/src/b1t6.rs b/bee-ternary/src/b1t6.rs index 98db821be2..a20d1e7df2 100644 --- a/bee-ternary/src/b1t6.rs +++ b/bee-ternary/src/b1t6.rs @@ -3,8 +3,6 @@ use crate::{Btrit, RawEncoding, RawEncodingBuf, TritBuf, Trits, Tryte}; -use std::convert::TryFrom; - const TRITS_PER_BYTE: usize = 2; const TRITS_PER_TRYTE: usize = 3; diff --git a/bee-ternary/src/convert.rs b/bee-ternary/src/convert.rs index 433c901761..25245cad8a 100644 --- a/bee-ternary/src/convert.rs +++ b/bee-ternary/src/convert.rs @@ -2,8 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{Btrit, RawEncoding, RawEncodingBuf, Trit, TritBuf, Trits, Utrit}; + use num_traits::{AsPrimitive, CheckedAdd, CheckedSub, FromPrimitive, Num, Signed}; -use std::{cmp::PartialOrd, convert::TryFrom}; + +use std::cmp::PartialOrd; /// An error that may be produced during numeric conversion. #[derive(Debug, PartialEq)] diff --git a/bee-ternary/src/lib.rs b/bee-ternary/src/lib.rs index 49e9bd0076..307b70faa9 100644 --- a/bee-ternary/src/lib.rs +++ b/bee-ternary/src/lib.rs @@ -79,17 +79,6 @@ pub mod tryte; mod serde; use crate::raw::{RawEncoding, RawEncodingBuf}; -use std::{ - any, - borrow::{Borrow, BorrowMut}, - cmp::Ordering, - convert::TryFrom, - error, fmt, hash, - iter::FromIterator, - ops::{ - Deref, DerefMut, Index, IndexMut, Neg, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive, - }, -}; pub use crate::{ t1b1::{T1B1Buf, T1B1}, @@ -101,6 +90,16 @@ pub use crate::{ tryte::{Tryte, TryteBuf}, }; +use std::{ + any, + borrow::{Borrow, BorrowMut}, + cmp::Ordering, + error, fmt, hash, + ops::{ + Deref, DerefMut, Index, IndexMut, Neg, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive, + }, +}; + /// An error that may be produced as a result of fallible conversions. #[derive(Debug)] pub enum Error { diff --git a/bee-ternary/src/serde.rs b/bee-ternary/src/serde.rs index 30fbf73e27..d19a0982af 100644 --- a/bee-ternary/src/serde.rs +++ b/bee-ternary/src/serde.rs @@ -2,12 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{Btrit, RawEncoding, RawEncodingBuf, TritBuf, Trits, Utrit}; + use serde::{ de::{Error, SeqAccess, Unexpected, Visitor}, ser::SerializeSeq, Deserialize, Deserializer, Serialize, Serializer, }; -use std::{convert::TryFrom, fmt, marker::PhantomData}; + +use std::{fmt, marker::PhantomData}; // Serialisation diff --git a/bee-ternary/src/t1b1.rs b/bee-ternary/src/t1b1.rs index 02c801c6c1..9182b50d63 100644 --- a/bee-ternary/src/t1b1.rs +++ b/bee-ternary/src/t1b1.rs @@ -3,7 +3,7 @@ use crate::{trit::ShiftTernary, Btrit, RawEncoding, RawEncodingBuf, Trit}; -use std::{convert::TryInto, hash, marker::PhantomData, ops::Range}; +use std::{hash, marker::PhantomData, ops::Range}; /// An encoding scheme slice that uses a single byte to represent one trit. #[repr(transparent)] diff --git a/bee-ternary/src/trit/balanced.rs b/bee-ternary/src/trit/balanced.rs index 4bdb733a6e..1c9174869e 100644 --- a/bee-ternary/src/trit/balanced.rs +++ b/bee-ternary/src/trit/balanced.rs @@ -2,9 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use super::{ShiftTernary, Trit, Utrit}; + use crate::convert; + use num_traits::{CheckedAdd, CheckedSub, Num}; -use std::{convert::TryFrom, fmt, ops::Neg}; + +use std::{fmt, ops::Neg}; #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] #[repr(i8)] diff --git a/bee-ternary/src/trit/mod.rs b/bee-ternary/src/trit/mod.rs index 8c3291a93c..338a60d012 100644 --- a/bee-ternary/src/trit/mod.rs +++ b/bee-ternary/src/trit/mod.rs @@ -2,8 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::convert; + use num_traits::{CheckedAdd, CheckedSub, Num}; -use std::{convert::TryFrom, fmt, hash}; + +use std::{fmt, hash}; /// Balanced trits. pub mod balanced; diff --git a/bee-ternary/src/trit/unbalanced.rs b/bee-ternary/src/trit/unbalanced.rs index 01ffd7dcc7..5eab175cd3 100644 --- a/bee-ternary/src/trit/unbalanced.rs +++ b/bee-ternary/src/trit/unbalanced.rs @@ -2,9 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use super::{Btrit, ShiftTernary, Trit}; + use crate::convert; + use num_traits::{CheckedAdd, CheckedSub, Num}; -use std::{convert::TryFrom, fmt}; + +use std::fmt; #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] #[repr(i8)] diff --git a/bee-ternary/src/tryte.rs b/bee-ternary/src/tryte.rs index 8f812a813f..0a76bd9692 100644 --- a/bee-ternary/src/tryte.rs +++ b/bee-ternary/src/tryte.rs @@ -2,10 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{Btrit, Error, Trits, T3B1}; + use std::{ - convert::TryFrom, fmt, - iter::FromIterator, ops::{Deref, DerefMut}, str::FromStr, }; diff --git a/bee-test/Cargo.toml b/bee-test/Cargo.toml index c3baf2c3ef..650e1c2e4e 100644 --- a/bee-test/Cargo.toml +++ b/bee-test/Cargo.toml @@ -2,7 +2,7 @@ name = "bee-test" version = "0.1.0" authors = [ "IOTA Stiftung" ] -edition = "2018" +edition = "2021" description = "Test utilities and feature tests for bee" readme = "README.md" repository = "https://github.com/iotaledger/bee" diff --git a/bee-test/src/rand/metadata.rs b/bee-test/src/rand/metadata.rs index a0d2a5aad0..014baf6368 100644 --- a/bee-test/src/rand/metadata.rs +++ b/bee-test/src/rand/metadata.rs @@ -11,8 +11,6 @@ use bee_tangle::{ ConflictReason, }; -use std::convert::TryInto; - /// Generates a random conflict reason. pub fn rand_conflict_reason() -> ConflictReason { ((rand_number::() % 7) as u8).try_into().unwrap() diff --git a/bee-test/src/rand/receipt.rs b/bee-test/src/rand/receipt.rs index d721f6f2fd..5403ee0ee5 100644 --- a/bee-test/src/rand/receipt.rs +++ b/bee-test/src/rand/receipt.rs @@ -15,8 +15,6 @@ use bee_ternary::{T5B1Buf, Tryte, TryteBuf}; use bytemuck::cast_slice; -use std::convert::{TryFrom, TryInto}; - /// Generates a random tail transaction hash. pub fn rand_tail_transaction_hash() -> TailTransactionHash { let bytes = rand_string_charset("ABCDEFGHIJKLMNOPQRSTUVWXYZ9", 81) diff --git a/bee-test/src/ternary.rs b/bee-test/src/ternary.rs index d7273a1255..d9759829d1 100644 --- a/bee-test/src/ternary.rs +++ b/bee-test/src/ternary.rs @@ -8,7 +8,7 @@ use bee_ternary::*; use rand::prelude::*; -use std::{convert::TryFrom, ops::Range}; +use std::ops::Range; /// Generates a random i8 trit. pub fn gen_trit() -> i8 { diff --git a/bee-test/tests/ternary/buf.rs b/bee-test/tests/ternary/buf.rs index 53e9832844..ff486cb1d3 100644 --- a/bee-test/tests/ternary/buf.rs +++ b/bee-test/tests/ternary/buf.rs @@ -6,8 +6,6 @@ use bee_test::ternary::*; use rand::prelude::*; -use std::convert::{TryFrom, TryInto}; - fn create_generic() { assert!(TritBuf::::new().len() == 0); fuzz(100, || { diff --git a/bee-test/tests/ternary/convert.rs b/bee-test/tests/ternary/convert.rs index b9f15ad614..183f7c28e0 100644 --- a/bee-test/tests/ternary/convert.rs +++ b/bee-test/tests/ternary/convert.rs @@ -6,8 +6,8 @@ use bee_ternary::{ trit::{Btrit, Utrit}, T1B1Buf, TritBuf, }; + use std::{ - convert::TryFrom, io::{self, Write}, time::Instant, }; diff --git a/bee-test/tests/ternary/slice.rs b/bee-test/tests/ternary/slice.rs index 3ef6fe49d0..a3fcefcd14 100644 --- a/bee-test/tests/ternary/slice.rs +++ b/bee-test/tests/ternary/slice.rs @@ -6,8 +6,6 @@ use bee_test::ternary::*; use rand::prelude::*; -use std::convert::{TryFrom, TryInto}; - fn get_generic() { println!("{}", std::any::type_name::()); fuzz(100, || { diff --git a/bee-test/tests/ternary/trit.rs b/bee-test/tests/ternary/trit.rs index dd56ee2f56..4affaa5e49 100644 --- a/bee-test/tests/ternary/trit.rs +++ b/bee-test/tests/ternary/trit.rs @@ -3,8 +3,6 @@ use bee_ternary::*; -use std::convert::TryFrom; - #[test] fn convert_correct() { assert_eq!(Utrit::try_from(0i8).unwrap(), Utrit::Zero);