Update families to rust 2021

Signed-off-by: Joseph Livesey <joseph.livesey@btp.works>

Author: suchapalaver

families/battleship/Cargo.toml

@@ -16,6 +16,7 @@
 name = "battleship"
 version = "0.1.0"
 authors = ["Bitwise IO, Inc."]
+edition = '2021'
 
 [[example]]
 name = "play"

families/battleship/src/client.rs

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::game::{Action, Game};
+use crate::transaction_builder::TransactionBuilder;
 use base64::{engine::general_purpose, Engine as _};
 use dirs::home_dir;
 use failure::Error;
-use game::{Action, Game};
 use reqwest::{Client, Url};
 use sawtooth_sdk::signing::secp256k1::Secp256k1PrivateKey;
 use sawtooth_sdk::signing::{create_context, PrivateKey, Signer};
@@ -26,7 +27,6 @@ use std::io::Read;
 use std::path::PathBuf;
 use std::thread::sleep;
 use std::time::Duration;
-use transaction_builder::TransactionBuilder;
 
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Deserialize, Debug)]

families/battleship/src/handler.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use game;
+use crate::game;
 use sawtooth_sdk::messages::processor::TpProcessRequest;
 use sawtooth_sdk::processor::handler::{ApplyError, TransactionContext, TransactionHandler};
 use serde_json;

families/block_info/sawtooth_block_info/Cargo.toml

@@ -20,6 +20,7 @@ version = "1.0.0"
 authors = ["Bitwise IO"]
 build = "build.rs"
 description = "The Sawtooth Block Info transaction processor"
+edition = '2021'
 
 [package.metadata.deb]
 depends = "$auto"

families/block_info/sawtooth_block_info/src/handler.rs

@@ -17,9 +17,9 @@
 
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use addressing::NAMESPACE;
-use payload::BlockInfoPayload;
-use state::{BlockInfoState, Config, DEFAULT_SYNC_TOLERANCE, DEFAULT_TARGET_COUNT};
+use crate::addressing::NAMESPACE;
+use crate::payload::BlockInfoPayload;
+use crate::state::{BlockInfoState, Config, DEFAULT_SYNC_TOLERANCE, DEFAULT_TARGET_COUNT};
 
 cfg_if! {
     if #[cfg(target_arch = "wasm32")] {

families/block_info/sawtooth_block_info/src/payload.rs

@@ -15,7 +15,7 @@
  * ------------------------------------------------------------------------------
  */
 
-use state::BlockInfo;
+use crate::state::BlockInfo;
 
 cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
@@ -25,8 +25,8 @@ cfg_if! {
     }
 }
 
+use crate::protos::block_info::BlockInfoTxn;
 use protobuf::Message;
-use protos::block_info::BlockInfoTxn;
 
 fn validate_hex(string: &str, length: usize) -> bool {
     hex::decode(string).is_ok() && string.len() == length

families/block_info/sawtooth_block_info/src/state.rs

@@ -15,9 +15,9 @@
  * ------------------------------------------------------------------------------
  */
 
-use addressing::{create_block_address, get_config_addr};
+use crate::addressing::{create_block_address, get_config_addr};
+use crate::protos;
 use protobuf::Message;
-use protos;
 
 pub const DEFAULT_SYNC_TOLERANCE: u64 = 60 * 5;
 pub const DEFAULT_TARGET_COUNT: u64 = 256;

families/identity/sawtooth_identity/Cargo.toml

@@ -20,6 +20,7 @@ version = "0.1.0"
 authors = ["Bitwise IO"]
 build = "build.rs"
 description = "The Sawtooth Identity TP for validating on-chain roles and identities."
+edition = '2021'
 
 [[bin]]
 name = "identity-tp"

families/identity/sawtooth_identity/src/handler.rs

@@ -31,11 +31,11 @@ cfg_if! {
     }
 }
 
+use crate::protos::identities::{IdentityPayload, IdentityPayload_IdentityType};
+use crate::state::IdentityState;
 use crypto::digest::Digest;
 use crypto::sha2::Sha256;
 use protobuf::Message;
-use protos::identities::{IdentityPayload, IdentityPayload_IdentityType};
-use state::IdentityState;
 use std::iter::repeat;
 
 #[cfg(target_arch = "wasm32")]

families/settings/sawtooth_settings/Cargo.toml

@@ -19,6 +19,7 @@ authors = ["Bitwise IO"]
 build = "build.rs"
 description = "The Sawtooth Settings transaction processor for validating on-chain settings."
 license = "Apache-2.0"
+edition = '2021'
 
 [package.metadata.deb]
 depends = "$auto"