Skip to content

Commit

Permalink
[language] introduce diem-framework-releases
Browse files Browse the repository at this point in the history
Closes: diem#8028
  • Loading branch information
vgao1996 authored and bors-libra committed Mar 31, 2021
1 parent 79ac8a5 commit 06206e4
Show file tree
Hide file tree
Showing 262 changed files with 11,384 additions and 2,487 deletions.
83 changes: 42 additions & 41 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ members = [
"language/compiler/ir-to-bytecode",
"language/compiler/ir-to-bytecode/syntax",
"language/diem-framework",
"language/diem-framework/compiled",
"language/diem-framework/releases",
"language/diem-tools/diem-events-fetcher",
"language/diem-tools/diem-validator-interface",
"language/diem-tools/transaction-replay",
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-builder/src/stdlib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// This file was generated. Do not modify!
//
// To re-generate this code, run: `cargo run --release -p stdlib`
// To re-generate this code, run: `cargo run --release -p diem-framework`

//! Conversion library between a structured representation of a Move script call (`ScriptCall`) and the
//! standard BCS-compatible representation used in Diem transactions (`Script`).
Expand Down
1 change: 0 additions & 1 deletion docker/compose/test_docker_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# SPDX-License-Identifier: Apache-2.0

set timeout 10

set basedir [file normalize [file dirname $argv0]]
cd $basedir

Expand Down
2 changes: 1 addition & 1 deletion execution/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ proptest = { version = "1.0.0", optional = true }
proptest = "1.0.0"
rand = "0.8.3"

compiled-stdlib = { path = "../../language/diem-framework/compiled" }
diem-framework-releases = { path = "../../language/diem-framework/releases" }
compiler = { path = "../../language/compiler" }
executor-test-helpers = { path = "../executor-test-helpers" }
diem-config = { path = "../../config" }
Expand Down
4 changes: 2 additions & 2 deletions json-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ proptest = { version = "1.0.0", optional = true }
regex = { version = "1.4.3", default-features = false, features = ["std", "perf"] }

bcs = "0.1.2"
compiled-stdlib = { path = "../language/diem-framework/compiled" }
diem-framework-releases= { path = "../language/diem-framework/releases" }
diem-config = { path = "../config" }
diem-crypto = { path = "../crypto/crypto" }
diemdb = { path = "../storage/diemdb", optional = true }
Expand Down Expand Up @@ -58,7 +58,7 @@ diem-proptest-helpers = { path = "../common/proptest-helpers" }
diem-temppath = { path = "../common/temppath" }
diem-types = { path = "../types", features = ["fuzzing"] }
vm-validator = { path = "../vm-validator" }
compiled-stdlib = { path = "../language/diem-framework/compiled" }
diem-framework-releases= { path = "../language/diem-framework/releases" }
vm-genesis = { path = "../language/tools/vm-genesis" }
executor = { path = "../execution/executor" }
executor-types = { path = "../execution/executor-types" }
Expand Down
5 changes: 2 additions & 3 deletions json-rpc/src/tests/genesis.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use compiled_stdlib::StdLibOptions;
use diem_types::{
account_address::{AccountAddress, HashAccountAddress},
account_state_blob::AccountStateBlob,
Expand All @@ -11,14 +10,14 @@ use executor::process_write_set;
use executor_types::ProofReader;
use scratchpad::SparseMerkleTree;
use std::{collections::HashMap, sync::Arc};
use vm_genesis::generate_genesis_change_set_for_testing;
use vm_genesis::{generate_genesis_change_set_for_testing, GenesisOptions};

// generate genesis state blob
pub fn generate_genesis_state() -> (
HashMap<AccountAddress, AccountStateBlob>,
Arc<SparseMerkleTree<AccountStateBlob>>,
) {
let change_set = generate_genesis_change_set_for_testing(StdLibOptions::Compiled);
let change_set = generate_genesis_change_set_for_testing(GenesisOptions::Compiled);
let txn = Transaction::GenesisTransaction(WriteSetPayload::Direct(change_set.clone()));
let proof_reader = ProofReader::new(HashMap::new());
let tree = SparseMerkleTree::default();
Expand Down
2 changes: 1 addition & 1 deletion json-rpc/src/util.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use compiled_stdlib::legacy::transaction_scripts;
use diem_crypto::HashValue;
use diem_framework_releases::legacy::transaction_scripts;
use diem_json_rpc_types::views::{
BytesView, MoveAbortExplanationView, ScriptView, TransactionDataView, VMStatusView,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bytecode-verifier = { path = "../" }
diem-workspace-hack = { path = "../../../common/workspace-hack" }
invalid-mutations = { path = "../invalid-mutations" }
move-core-types = { path = "../../move-core/types" }
compiled-stdlib = { path = "../../diem-framework/compiled" }
diem-framework-releases = { path = "../../diem-framework/releases" }
vm = { path = "../../vm", features = ["fuzzing"] }

[features]
Expand Down
2 changes: 1 addition & 1 deletion language/compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ anyhow = "1.0.38"
bytecode-verifier = { path = "../bytecode-verifier" }
ir-to-bytecode = { path = "ir-to-bytecode" }
bytecode-source-map = { path = "bytecode-source-map" }
compiled-stdlib = { path = "../diem-framework/compiled" }
diem-framework-releases = { path = "../diem-framework/releases" }
diem-workspace-hack = { path = "../../common/workspace-hack" }
move-ir-types = { path = "../move-ir/types" }
move-core-types = { path = "../move-core/types" }
Expand Down
Loading

0 comments on commit 06206e4

Please sign in to comment.