Removes objects from errors

Flyman110 · Dec 30, 2020 · 3072884 · 3072884
1 parent 7775ac3
commit 3072884
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 316 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/errors/src/lib.rs b/errors/src/lib.rs
@@ -19,6 +19,5 @@
 #[macro_use]
 extern crate thiserror;
 
-pub mod objects;
 pub mod serialization;
 pub mod storage;
diff --git a/errors/src/objects/account.rs b/errors/src/objects/account.rs
diff --git a/errors/src/objects/amount.rs b/errors/src/objects/amount.rs
diff --git a/errors/src/objects/block.rs b/errors/src/objects/block.rs
diff --git a/errors/src/objects/mod.rs b/errors/src/objects/mod.rs
diff --git a/errors/src/objects/transaction.rs b/errors/src/objects/transaction.rs
diff --git a/errors/src/storage/storage.rs b/errors/src/storage/storage.rs
@@ -14,8 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with the snarkOS library. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::objects::{BlockError, TransactionError};
-use snarkvm_errors::{algorithms::MerkleError, parameters::ParametersError};
+use snarkvm_errors::{
+    algorithms::MerkleError,
+    objects::{BlockError, TransactionError},
+    parameters::ParametersError,
+};
 
 use std::fmt::Debug;
 

diff --git a/models/Cargo.toml b/models/Cargo.toml
@@ -12,8 +12,6 @@ license = "GPL-3.0"
 edition = "2018"
 
 [dependencies]
-snarkos-errors = { path = "../errors", version = "1.1.4", default-features = false }
-
 bincode = { version = "1.3.1" }
 cfg-if = { version = "0.1.10" }
 derivative = { version = "2" }
@@ -28,7 +26,7 @@ snarkvm-models = { git = "https://github.com/AleoHQ/snarkVM.git", rev = "ce04949
 snarkvm-utilities = { git = "https://github.com/AleoHQ/snarkVM.git", rev = "ce04949", version = "0.0.1" }
 
 [features]
-default = [ "snarkos-errors/default", "snarkvm-utilities/default", ]
+default = [ "snarkvm-errors/default", "snarkvm-utilities/default", ]
 
 [dev-dependencies.criterion]
 version = "0.3"

diff --git a/models/src/objects/account.rs b/models/src/objects/account.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the snarkOS library. If not, see <https://www.gnu.org/licenses/>.
 
-use snarkos_errors::objects::AccountError;
+use snarkvm_errors::objects::AccountError;
 use snarkvm_models::algorithms::{CommitmentScheme, EncryptionScheme, SignatureScheme};
 
 use rand::Rng;

diff --git a/models/src/objects/transaction.rs b/models/src/objects/transaction.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the snarkOS library. If not, see <https://www.gnu.org/licenses/>.
 
-use snarkos_errors::objects::TransactionError;
+use snarkvm_errors::objects::TransactionError;
 use snarkvm_utilities::bytes::{FromBytes, ToBytes};
 
 use std::hash::Hash;