Skip to content

Commit

Permalink
keep the existing license owner
Browse files Browse the repository at this point in the history
  • Loading branch information
davidiw authored and aptos-bot committed Mar 12, 2022
1 parent f2caf50 commit 3ba9b4e
Show file tree
Hide file tree
Showing 1,239 changed files with 11,971 additions and 1,245 deletions.
2 changes: 1 addition & 1 deletion .github/actions/land-blocking/find-lbt-images.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) The Aptos Foundation
# Copyright (c) The Diem Core Contributors
# SPDX-License-Identifier: Apache-2.0

REPOS=(diem/validator diem/init diem/validator_tcb)
Expand Down
2 changes: 1 addition & 1 deletion api/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) The Aptos Foundation
# Copyright (c) The Diem Core Contributors
# SPDX-License-Identifier: Apache-2.0

test: clean lint test-code-gen test-api-spec clean
Expand Down
2 changes: 1 addition & 1 deletion api/doc/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ info:
url: http://www.apache.org/licenses/LICENSE-2.0.html
version: 0.1.0
contact:
name: The Aptos Foundation
name: The Diem Core Contributors
url: https://github.com/aptos-labs/aptos-core
tags:
- name: general
Expand Down
2 changes: 1 addition & 1 deletion api/src/accounts.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion api/src/context.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_api_types::{Error, LedgerInfo, MoveConverter, TransactionOnChainData};
Expand Down
2 changes: 1 addition & 1 deletion api/src/events.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion api/src/failpoint.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

#[allow(unused_imports)]
Expand Down
2 changes: 1 addition & 1 deletion api/src/health_check.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use anyhow::{ensure, Result};
Expand Down
2 changes: 1 addition & 1 deletion api/src/index.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion api/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod accounts;
Expand Down
2 changes: 1 addition & 1 deletion api/src/log.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use std::time::Duration;
Expand Down
2 changes: 1 addition & 1 deletion api/src/metrics.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_metrics::{register_histogram_vec, HistogramVec};
Expand Down
2 changes: 1 addition & 1 deletion api/src/page.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::param::{Param, TransactionVersionParam};
Expand Down
2 changes: 1 addition & 1 deletion api/src/param.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_api_types::{Address, Error, EventKey, MoveStructTag, TransactionId};
Expand Down
2 changes: 1 addition & 1 deletion api/src/runtime.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{context::Context, index};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/accounts_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::{assert_json, find_value, new_test_context};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/events_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::{assert_json, new_test_context};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/index_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::{assert_json, new_test_context};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/invalid_post_request_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::new_test_context;
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod accounts_test;
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/string_resource_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::new_test_context;
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/test_context.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{context::Context, index, tests::pretty};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/transactions_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::tests::{assert_json, find_value, new_test_context, pretty, TestContext};
Expand Down
2 changes: 1 addition & 1 deletion api/src/transactions.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion api/src/version.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::param::LedgerVersionParam;
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/account.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{HexEncodedBytes, U64};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/address.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_types::account_address::AccountAddress;
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/bytecode.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use std::borrow::Borrow;
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/convert.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use serde::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/event_key.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/hash.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/ledger_info.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::U64;
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod account;
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/mime_types.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

pub const BCS_SIGNED_TRANSACTION: &str = "application/x.diem.signed_transaction+bcs";
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/move_types.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{Address, Bytecode};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/response.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{Error, LedgerInfo};
Expand Down
2 changes: 1 addition & 1 deletion api/types/src/transaction.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-keygen/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_crypto::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-keygen/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_crypto::ValidCryptoMaterialStringExt;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-resource-viewer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use anyhow::{bail, Result};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_transaction_benchmarks::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-transaction-benchmarks/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

#![forbid(unsafe_code)]
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-transaction-benchmarks/src/measurement.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use criterion::Criterion;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_crypto::HashValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use anyhow::{bail, format_err, Result};
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-transactional-test-harness/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod diem_test_harness;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-transactional-test-harness/tests/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_transactional_test_harness::run_dpn_test;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-validator-interface/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod storage_interface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::AptosValidatorInterface;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/access_path_cache.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_types::access_path::AccessPath;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/adapter_common.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{counters::*, data_cache::StateViewCache};
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/aptos_vm.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/aptos_vm_impl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/counters.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_metrics::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/data_cache.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0
//! Scratchpad for on chain values during the execution.

Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/errors.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::logging::AdapterLogSchema;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/foreign_contracts.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

//! This file contains models of the vm crate's dependencies for use with MIRAI.
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

#![forbid(unsafe_code)]
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/logging.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::counters::CRITICAL_ERRORS;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/natives.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use aptos_types::account_config::CORE_CODE_ADDRESS;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/parallel_executor/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

mod read_write_set_analyzer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::data_cache::RemoteStorage;
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/parallel_executor/vm_wrapper.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/src/read_write_set_analysis.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) The Aptos Foundation
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use crate::{
Expand Down
Loading

0 comments on commit 3ba9b4e

Please sign in to comment.