Update perf to rust 2021

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

Author: suchapalaver

perf/intkey_workload/Cargo.toml

@@ -3,6 +3,7 @@ name = "sawtooth-intkey-workload"
 version = "0.1.0"
 authors = ["Intel Corporation"]
 description = "Workload generator for Sawtooth Intkey"
+edition = '2021'
 
 [[bin]]
 name = "intkey-workload"

perf/intkey_workload/src/intkey_transformer.rs

@@ -15,11 +15,11 @@
  * ------------------------------------------------------------------------------
  */
 
+use crate::intkey_addresser::IntKeyAddresser;
+use crate::intkey_iterator::IntKeyPayload;
 use cbor::GenericEncoder;
 use crypto::digest::Digest;
 use crypto::sha2::Sha512;
-use intkey_addresser::IntKeyAddresser;
-use intkey_iterator::IntKeyPayload;
 use protobuf::{Message, RepeatedField};
 use rand::prelude::*;
 use sawtooth_sdk::messages::transaction::{Transaction, TransactionHeader};
@@ -186,7 +186,7 @@ impl<'a> IntKeyTransformer<'a> {
 #[cfg(test)]
 mod tests {
     use super::IntKeyTransformer;
-    use intkey_iterator::IntKeyIterator;
+    use crate::intkey_iterator::IntKeyIterator;
     use protobuf::Message;
     use sawtooth_sdk::messages::transaction::TransactionHeader;
     use sawtooth_sdk::signing;

perf/sawtooth_perf/Cargo.toml

@@ -16,6 +16,7 @@
 name = "sawtooth_perf"
 version = "0.1.0"
 authors = ["Intel Corporation"]
+edition = '2021'
 
 [dependencies]
 sawtooth-sdk = "0.3"

perf/sawtooth_perf/src/batch_gen.rs

@@ -31,7 +31,7 @@ use sawtooth_sdk::messages::transaction::Transaction;
 
 use sawtooth_sdk::signing;
 
-use source::LengthDelimitedMessageSource;
+use crate::source::LengthDelimitedMessageSource;
 
 /// Generates signed batches from a stream of length-delimited transactions.
 /// Constrains the batches to `max_batch_size` number of transactions per

perf/sawtooth_perf/src/batch_submit.rs

@@ -42,10 +42,10 @@ use tokio_timer;
 use sawtooth_sdk::messages::batch::Batch;
 use sawtooth_sdk::messages::batch::BatchList;
 
-use batch_gen::{BatchResult, BatchingError};
-use batch_map::BatchMap;
-use source::LengthDelimitedMessageSource;
-use workload;
+use crate::batch_gen::{BatchResult, BatchingError};
+use crate::batch_map::BatchMap;
+use crate::source::LengthDelimitedMessageSource;
+use crate::workload;
 
 /// Populates a channel from a stream of length-delimited batches.
 /// Starts one workload submitter of the appropriate type (http, zmq)

perf/sawtooth_perf/src/workload.rs

@@ -42,10 +42,10 @@ use tokio_core::reactor::Handle;
 
 use sawtooth_sdk::messages::batch::BatchList;
 
-use batch_submit::BatchListResult;
-use batch_submit::BatchReadingError;
+use crate::batch_submit::BatchListResult;
+use crate::batch_submit::BatchReadingError;
 
-use batch_map::BatchMap;
+use crate::batch_map::BatchMap;
 
 #[allow(clippy::enum_variant_names)]
 #[derive(Debug)]

perf/sawtooth_workload/Cargo.toml

@@ -15,6 +15,7 @@
 [package]
 name = "sawtooth_workload"
 version = "0.1.0"
+edition = '2021'
 
 [dependencies]
 sawtooth-sdk = "0.3"

perf/smallbank_workload/Cargo.toml

@@ -18,6 +18,7 @@ version = "0.1.0"
 build = "build.rs"
 authors = ["Intel Corporation"]
 description = "Workload generator for Sawtooth Smallbank"
+edition = '2021'
 
 [dependencies]
 sawtooth-sdk = "0.3"

perf/smallbank_workload/src/playlist.rs

@@ -36,9 +36,9 @@ use self::yaml_rust::YamlEmitter;
 use self::yaml_rust::YamlLoader;
 use rand::prelude::*;
 
-use protos::smallbank;
-use protos::smallbank::SmallbankTransactionPayload;
-use protos::smallbank::SmallbankTransactionPayload_PayloadType as SBPayloadType;
+use crate::protos::smallbank;
+use crate::protos::smallbank::SmallbankTransactionPayload;
+use crate::protos::smallbank::SmallbankTransactionPayload_PayloadType as SBPayloadType;
 
 use protobuf;
 use protobuf::Message;

perf/smallbank_workload/src/smallbank_transformer.rs

@@ -29,9 +29,11 @@ use protobuf::Message;
 use sawtooth_sdk::messages::transaction::{Transaction, TransactionHeader};
 use sawtooth_sdk::signing;
 
-use playlist::bytes_to_hex_str;
-use playlist::make_addresses;
-use protos::smallbank::{SmallbankTransactionPayload, SmallbankTransactionPayload_PayloadType};
+use crate::playlist::bytes_to_hex_str;
+use crate::playlist::make_addresses;
+use crate::protos::smallbank::{
+    SmallbankTransactionPayload, SmallbankTransactionPayload_PayloadType,
+};
 
 /// Transforms SmallbankTransactionPayloads into Sawtooth Transactions.
 pub struct SBPayloadTransformer<'a> {
@@ -171,7 +173,7 @@ mod tests {
     use sawtooth_sdk::messages::transaction::TransactionHeader;
     use sawtooth_sdk::signing;
 
-    use playlist::SmallbankGeneratingIter;
+    use crate::playlist::SmallbankGeneratingIter;
 
     const NUM_CREATE_ACCOUNTS: usize = 100;
     const NUM_TO_CONSIDER: usize = 1_000;