Merge pull request #197 from isabeltomb/update-transact-to-sawtooth-dep

Replace transact dependencies with sawtooth

Author: agunde406

cli/Cargo.toml

@@ -19,11 +19,11 @@ tokio-core = "0.1"
 users = "0.6"
 yaml-rust = "0.4"
 reqwest = {version = "0.11", features = ["blocking", "json"], default-features = false}
+sawtooth = "0.8"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 sabre-sdk = {path = "../sdks/rust"}
-transact = "0.5"
 
 [build-dependencies]
 protoc-rust = "2"
@@ -47,4 +47,4 @@ experimental = [
 ]
 
 [patch.crates-io]
-transact = { git = "https://github.com/hyperledger/transact" }
+sawtooth = { git = "https://github.com/hyperledger/sawtooth-lib" }

cli/src/error.rs

@@ -17,9 +17,9 @@ use std::error::Error as StdError;
 
 use sabre_sdk::protocol::payload::{ActionBuildError, SabrePayloadBuildError};
 use sabre_sdk::protos::ProtoConversionError;
-use transact::{
-    protocol::{batch::BatchBuildError, transaction::TransactionBuildError},
+use sawtooth::{
     protos::ProtoConversionError as TransactProtoConversionError,
+    transact::protocol::{batch::BatchBuildError, transaction::TransactionBuildError},
 };
 
 #[derive(Debug)]

cli/src/submit.rs

@@ -20,7 +20,8 @@ use reqwest::{
 };
 use std::fmt;
 
-use transact::{protocol::batch::Batch, protos::IntoBytes};
+use sawtooth::protos::IntoBytes;
+use sawtooth::transact::protocol::batch::Batch;
 
 use crate::error::CliError;
 
@@ -160,7 +161,7 @@ mod tests {
 
     use cylinder::{secp256k1::Secp256k1Context, Context};
     use mockito;
-    use transact::protocol::{
+    use sawtooth::transact::protocol::{
         batch::{Batch, BatchBuilder},
         transaction::{HashMethod, TransactionBuilder},
     };

example/intkey_multiply/processor/Cargo.toml

@@ -53,4 +53,4 @@ experimental = [
 ]
 
 [patch.crates-io]
-transact = { git = "https://github.com/hyperledger/transact" }
+sawtooth = { git = "https://github.com/hyperledger/sawtooth-lib" }

sdks/rust/Cargo.toml

@@ -30,7 +30,7 @@ protobuf = "2.19"
 sha2 = "0.10"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-transact = "0.5"
+sawtooth = { version = "0.8", dependencies = ["family-sabre"]}
 cylinder = "0.2"
 
 [build-dependencies]
@@ -53,4 +53,4 @@ experimental = [
 ]
 
 [patch.crates-io]
-transact = { git = "https://github.com/hyperledger/transact" }
+sawtooth = { git = "https://github.com/hyperledger/sawtooth-lib" }

sdks/rust/src/protocol/payload.rs

@@ -15,7 +15,7 @@
 use protobuf::Message;
 use protobuf::RepeatedField;
 #[cfg(not(target_arch = "wasm32"))]
-use transact::protocol::transaction::{HashMethod, TransactionBuilder};
+use sawtooth::transact::protocol::transaction::{HashMethod, TransactionBuilder};
 
 use std::error::Error as StdError;
 

tp/Cargo.toml

@@ -35,9 +35,9 @@ log = "0.4"
 simple_logger = "1.16"
 clap = "2"
 protobuf = "2.19"
+sawtooth = { version = "0.8", features = ["family-sabre", "transact-execution"] }
 sha2 = "0.10"
 wasmi = "0.9"
-transact = {version = "0.5", features = ["family-sabre"]}
 
 [build-dependencies]
 protoc-rust = "2"
@@ -58,4 +58,4 @@ experimental = [
 ]
 
 [patch.crates-io]
-transact = { git = "https://github.com/hyperledger/transact" }
+sawtooth = { git = "https://github.com/hyperledger/sawtooth-lib" }

tp/src/handler.rs

@@ -20,11 +20,11 @@ use sawtooth_sdk::processor::handler::ApplyError;
 use sawtooth_sdk::processor::handler::TransactionContext;
 use sawtooth_sdk::processor::handler::TransactionHandler;
 
-use transact::families::sabre::handler::SabreTransactionHandler;
-use transact::handler::ContextError;
-use transact::handler::TransactionHandler as TransactHandler;
-use transact::protocol::transaction::Transaction;
-use transact::protos::transaction::TransactionHeader;
+use sawtooth::families::sabre::handler::SabreTransactionHandler;
+use sawtooth::protos::transaction::TransactionHeader;
+use sawtooth::transact::handler::ContextError;
+use sawtooth::transact::handler::TransactionHandler as TransactHandler;
+use sawtooth::transact::protocol::transaction::Transaction;
 
 /// The namespace registry prefix for global state (00ec00)
 const NAMESPACE_REGISTRY_PREFIX: &str = "00ec00";
@@ -39,7 +39,7 @@ struct SabreContext<'a> {
     sawtooth_context: &'a dyn TransactionContext,
 }
 
-impl<'a> transact::handler::TransactionContext for SabreContext<'a> {
+impl<'a> sawtooth::transact::handler::TransactionContext for SabreContext<'a> {
     fn get_state_entry(&self, address: &str) -> Result<Option<Vec<u8>>, ContextError> {
         let results = self
             .sawtooth_context
@@ -162,10 +162,10 @@ impl TransactionHandler for SabreHandler {
             .apply(&txn_pair, &mut sabre_context)
         {
             Ok(()) => Ok(()),
-            Err(transact::handler::ApplyError::InvalidTransaction(msg)) => {
+            Err(sawtooth::transact::handler::ApplyError::InvalidTransaction(msg)) => {
                 Err(ApplyError::InvalidTransaction(msg))
             }
-            Err(transact::handler::ApplyError::InternalError(msg)) => {
+            Err(sawtooth::transact::handler::ApplyError::InternalError(msg)) => {
                 Err(ApplyError::InternalError(msg))
             }
         }

tp/src/main.rs

@@ -22,9 +22,9 @@ mod handler;
 use clap::Arg;
 use log::LevelFilter;
 
+use sawtooth::families::sabre::admin;
+use sawtooth::families::sabre::handler::SabreTransactionHandler;
 use sawtooth_sdk::processor::TransactionProcessor;
-use transact::families::sabre::admin;
-use transact::families::sabre::handler::SabreTransactionHandler;
 
 use self::handler::SabreHandler;