Update validator to rust 2021

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

Author: suchapalaver

validator/Cargo.toml

@@ -2,6 +2,7 @@
 name = "sawtooth_validator"
 version = "1.3.0"
 authors = ["Intel Corporation"]
+edition = '2021'
 
 [dependencies]
 clap = "2"

validator/src/batch.rs

@@ -15,10 +15,10 @@
  * ------------------------------------------------------------------------------
  */
 
-use proto;
+use crate::proto;
 use protobuf::{self, Message};
 
-use transaction::Transaction;
+use crate::transaction::Transaction;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct Batch {

validator/src/batch_ffi.rs

@@ -15,16 +15,15 @@
  * ------------------------------------------------------------------------------
  */
 
-use cpython;
 use cpython::FromPyObject;
 use cpython::ObjectProtocol;
 use cpython::PythonObject;
 use cpython::ToPyObject;
 use protobuf::Message;
 
-use batch::Batch;
-use proto;
-use transaction::Transaction;
+use crate::batch::Batch;
+use crate::proto;
+use crate::transaction::Transaction;
 
 impl ToPyObject for Batch {
     type ObjectType = cpython::PyObject;
@@ -118,11 +117,10 @@ impl<'source> FromPyObject<'source> for Batch {
 mod tests {
 
     use super::Batch;
-    use cpython;
+    use crate::proto;
+    use crate::transaction::Transaction;
     use cpython::ToPyObject;
-    use proto;
     use protobuf::Message;
-    use transaction::Transaction;
 
     fn create_batch() -> Batch {
         let mut batch_header = proto::batch::BatchHeader::new();

validator/src/block.rs

@@ -15,8 +15,8 @@
  * ------------------------------------------------------------------------------
  */
 
-use batch::Batch;
-use proto;
+use crate::batch::Batch;
+use crate::proto;
 use protobuf::{self, Message};
 use std::fmt;
 

validator/src/block_ffi.rs

@@ -14,19 +14,17 @@
  * limitations under the License.
  * ------------------------------------------------------------------------------
  */
-use batch::Batch;
-use block::Block;
-use cpython;
+use crate::batch::Batch;
+use crate::block::Block;
+use crate::proto::batch::Batch as ProtoBatch;
+use crate::proto::batch::BatchHeader;
+use crate::proto::block::Block as ProtoBlock;
+use crate::proto::block::BlockHeader;
+use crate::proto::transaction::Transaction as ProtoTxn;
+use crate::proto::transaction::TransactionHeader;
+use crate::transaction::Transaction;
 use cpython::{FromPyObject, ObjectProtocol, PyObject, Python, PythonObject, ToPyObject};
-use proto::batch::Batch as ProtoBatch;
-use proto::batch::BatchHeader;
-use proto::block::Block as ProtoBlock;
-use proto::block::BlockHeader;
-use proto::transaction::Transaction as ProtoTxn;
-use proto::transaction::TransactionHeader;
-use protobuf;
 use protobuf::Message;
-use transaction::Transaction;
 
 impl<'source> FromPyObject<'source> for Block {
     fn extract(py: Python, obj: &'source PyObject) -> cpython::PyResult<Self> {

validator/src/consensus/notifier.rs

@@ -19,20 +19,20 @@ use std::sync::mpsc::{channel, Sender};
 use std::sync::{Arc, Mutex};
 use std::thread;
 
-use block::Block;
+use crate::block::Block;
 
-use hashlib::sha256_digest_strs;
+use crate::hashlib::sha256_digest_strs;
 use hex;
 use protobuf::{Message, RepeatedField};
 
-use proto::consensus::{
+use crate::proto::consensus::{
     ConsensusBlock, ConsensusNotifyBlockCommit, ConsensusNotifyBlockInvalid,
     ConsensusNotifyBlockNew, ConsensusNotifyBlockValid, ConsensusNotifyEngineActivated,
     ConsensusNotifyEngineDeactivated, ConsensusNotifyPeerConnected,
     ConsensusNotifyPeerDisconnected, ConsensusNotifyPeerMessage, ConsensusPeerInfo,
     ConsensusPeerMessage,
 };
-use proto::validator::Message_MessageType as MessageType;
+use crate::proto::validator::Message_MessageType as MessageType;
 
 pub trait ConsensusNotifier: Send + Sync {
     fn notify_peer_connected(&self, peer_id: &str);

validator/src/consensus/notifier_ffi.rs

@@ -23,13 +23,13 @@ use cpython::{NoArgs, ObjectProtocol, PyClone, PyObject, Python};
 use protobuf::{Message, ProtobufEnum};
 use py_ffi;
 
-use block::Block;
-use consensus::notifier::{
+use crate::block::Block;
+use crate::consensus::notifier::{
     BackgroundConsensusNotifier, ConsensusNotifier, NotifierService, NotifierServiceError,
 };
-use proto::validator::Message_MessageType as MessageType;
-use proto::{self, consensus::ConsensusPeerMessage};
-use pylogger;
+use crate::proto::validator::Message_MessageType as MessageType;
+use crate::proto::{self, consensus::ConsensusPeerMessage};
+use crate::pylogger;
 
 pub struct PyNotifierService {
     py_notifier_service: PyObject,

validator/src/consensus/registry_ffi.rs

@@ -17,8 +17,8 @@
 
 use cpython::{NoArgs, ObjectProtocol, PyClone, PyObject, Python};
 
-use consensus::registry::{ConsensusRegistry, ConsensusRegistryError, EngineInfo};
-use pylogger;
+use crate::consensus::registry::{ConsensusRegistry, ConsensusRegistryError, EngineInfo};
+use crate::pylogger;
 
 pub struct PyConsensusRegistry {
     py_consensus_registry: PyObject,

validator/src/database/lmdb.rs

@@ -21,7 +21,7 @@ use std::sync::Arc;
 
 use lmdb_zero as lmdb;
 
-use database::error::DatabaseError;
+use crate::database::error::DatabaseError;
 
 const DEFAULT_SIZE: usize = 1 << 40; // 1024 ** 4
 

validator/src/database/lmdb_ffi.rs

@@ -14,8 +14,8 @@
  * limitations under the License.
  * ------------------------------------------------------------------------------
  */
+use crate::database::lmdb::*;
 use cpython::{PyList, PyObject, Python};
-use database::lmdb::*;
 use py_ffi;
 use std::ffi::CStr;
 use std::os::raw::{c_char, c_void};