Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dependency] snarkVM 0.16.10 #7737

Merged
merged 1 commit into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
484 changes: 244 additions & 240 deletions Cargo.lock

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion compiler/compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ default-features = false

[dev-dependencies.snarkvm]
workspace = true
features = [ "circuit", "console" ]

[dev-dependencies.regex]
version = "1.10.2"
Expand Down
2 changes: 1 addition & 1 deletion compiler/compiler/tests/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use leo_test_framework::{
Test,
};

use snarkvm::prelude::*;
use snarkvm::console::prelude::*;

use serde::{Deserialize, Serialize};
use serde_yaml::Value;
Expand Down
3 changes: 1 addition & 2 deletions compiler/parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion compiler/parser/src/parser/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions compiler/passes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion compiler/passes/src/type_checking/check_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/passes/src/type_checking/check_program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion compiler/passes/src/type_checking/checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions leo/package/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion leo/package/src/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion leo/package/src/root/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading