Merge pull request #7737 from AleoHQ/deps/snarkvm-0.16.10

[Dependency] snarkVM 0.16.10
ProvableHQ · Nov 23, 2023 · b191c2f · b191c2f
2 parents 57c8c72 + b9cb62d
commit b191c2f
Show file tree

Hide file tree

Showing 13 changed files with 255 additions and 258 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,10 +45,7 @@ members = [
 ]
 
 [workspace.dependencies.snarkvm]
-version = "0.16.9"
-
-[workspace.dependencies.snarkvm-console]
-version = "0.16.6"
+version = "0.16.10"
 
 [lib]
 path = "leo/lib.rs"

diff --git a/compiler/compiler/Cargo.toml b/compiler/compiler/Cargo.toml
@@ -56,7 +56,6 @@ default-features = false
 
 [dev-dependencies.snarkvm]
 workspace = true
-features = [ "circuit", "console" ]
 
 [dev-dependencies.regex]
 version = "1.10.2"

diff --git a/compiler/compiler/tests/compile.rs b/compiler/compiler/tests/compile.rs
@@ -35,7 +35,7 @@ use leo_test_framework::{
     Test,
 };
 
-use snarkvm::prelude::*;
+use snarkvm::console::prelude::*;
 
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;

diff --git a/compiler/parser/Cargo.toml b/compiler/parser/Cargo.toml
@@ -30,9 +30,8 @@ version = "=1.10.0"
 path = "../span"
 version = "=1.10.0"
 
-[dependencies.snarkvm-console]
+[dependencies.snarkvm]
 workspace = true
-features = [ "account", "network" ]
 
 [dependencies.clap]
 version = "4.4"

diff --git a/compiler/parser/src/parser/expression.rs b/compiler/parser/src/parser/expression.rs
@@ -18,7 +18,7 @@ use super::*;
 use leo_errors::{ParserError, Result};
 
 use leo_span::{sym, Symbol};
-use snarkvm_console::{account::Address, network::Testnet3};
+use snarkvm::console::{account::Address, network::Testnet3};
 
 const INT_TYPES: &[Token] = &[
     Token::I8,

diff --git a/compiler/passes/Cargo.toml b/compiler/passes/Cargo.toml
@@ -21,9 +21,8 @@ rust-version = "1.69"
 [lib]
 path = "src/lib.rs"
 
-[dependencies.snarkvm-console]
+[dependencies.snarkvm]
 workspace = true
-features = [ "network" ]
 
 [dependencies.leo-ast]
 path = "../ast"

diff --git a/compiler/passes/src/type_checking/check_expressions.rs b/compiler/passes/src/type_checking/check_expressions.rs
@@ -21,7 +21,7 @@ use leo_errors::{emitter::Handler, TypeCheckerError};
 use leo_span::{sym, Span};
 
 use itertools::Itertools;
-use snarkvm_console::network::{Network, Testnet3};
+use snarkvm::console::network::{Network, Testnet3};
 use std::str::FromStr;
 
 fn return_incorrect_type(t1: Option<Type>, t2: Option<Type>, expected: &Option<Type>) -> Option<Type> {

diff --git a/compiler/passes/src/type_checking/check_program.rs b/compiler/passes/src/type_checking/check_program.rs
@@ -20,7 +20,7 @@ use leo_ast::*;
 use leo_errors::TypeCheckerError;
 use leo_span::sym;
 
-use snarkvm_console::network::{Network, Testnet3};
+use snarkvm::console::network::{Network, Testnet3};
 
 use std::collections::HashSet;
 

diff --git a/compiler/passes/src/type_checking/checker.rs b/compiler/passes/src/type_checking/checker.rs
@@ -20,7 +20,7 @@ use leo_ast::{CoreConstant, CoreFunction, Identifier, IntegerType, MappingType,
 use leo_errors::{emitter::Handler, TypeCheckerError};
 use leo_span::{Span, Symbol};
 
-use snarkvm_console::network::{Network, Testnet3};
+use snarkvm::console::network::{Network, Testnet3};
 
 use itertools::Itertools;
 use std::cell::RefCell;

diff --git a/leo/package/Cargo.toml b/leo/package/Cargo.toml
@@ -18,9 +18,8 @@ license = "GPL-3.0"
 edition = "2021"
 rust-version = "1.69"
 
-[dependencies.snarkvm-console]
+[dependencies.snarkvm]
 workspace = true
-features = [ "account" ]
 
 [dependencies.leo-errors]
 path = "../../errors"

diff --git a/leo/package/src/package.rs b/leo/package/src/package.rs
@@ -21,7 +21,7 @@ use crate::{
     source::{MainFile, SourceDirectory},
 };
 use leo_errors::{PackageError, Result};
-use snarkvm_console::prelude::Network;
+use snarkvm::console::prelude::Network;
 
 use serde::Deserialize;
 use std::{marker::PhantomData, path::Path};

diff --git a/leo/package/src/root/env.rs b/leo/package/src/root/env.rs
@@ -16,7 +16,7 @@
 
 //! The `.env` file.
 use leo_errors::{PackageError, Result};
-use snarkvm_console::{account::PrivateKey, prelude::Network};
+use snarkvm::console::{account::PrivateKey, prelude::Network};
 
 use serde::Deserialize;
 use std::{borrow::Cow, fs::File, io::Write, marker::PhantomData, path::Path};