From 5ca8cedd73f61274e12ebcc0be738173de37a703 Mon Sep 17 00:00:00 2001 From: austinabell Date: Fri, 31 Jan 2020 14:11:21 -0500 Subject: [PATCH] Add MIT license to dual --- LICENSE => LICENSE-APACHE | 0 LICENSE-MIT | 19 +++++++++++++++++++ README.md | 3 ++- blockchain/blocks/src/block.rs | 2 +- blockchain/blocks/src/errors.rs | 2 +- blockchain/blocks/src/header.rs | 2 +- blockchain/blocks/src/lib.rs | 2 +- blockchain/blocks/src/ticket.rs | 2 +- blockchain/blocks/src/tipset.rs | 2 +- blockchain/chain/src/lib.rs | 2 +- blockchain/chain/src/store/chain_store.rs | 2 +- blockchain/chain/src/store/errors.rs | 2 +- blockchain/chain/src/store/mod.rs | 2 +- blockchain/chain/src/store/tip_index.rs | 2 +- blockchain/chain_sync/src/block_msg.rs | 2 +- blockchain/chain_sync/src/block_proposer.rs | 2 +- blockchain/chain_sync/src/lib.rs | 2 +- blockchain/raw_block/src/lib.rs | 2 +- blockchain/raw_block/src/raw_block.rs | 2 +- blockchain/src/lib.rs | 2 +- blockchain/src/main.rs | 2 +- blockchain/src/message_pool/mod.rs | 2 +- blockchain/src/message_pool/pool.rs | 2 +- blockchain/src/storage_consensus/mod.rs | 2 +- blockchain/sync_manager/src/bucket.rs | 2 +- blockchain/sync_manager/src/errors.rs | 2 +- blockchain/sync_manager/src/lib.rs | 2 +- blockchain/sync_manager/src/manager.rs | 2 +- blockchain/sync_manager/src/sync.rs | 2 +- blockchain/sync_manager/tests/manager_test.rs | 2 +- copyright.txt | 3 --- crypto/src/errors.rs | 2 +- crypto/src/lib.rs | 2 +- crypto/src/signature.rs | 2 +- crypto/src/signer.rs | 2 +- crypto/src/vrf.rs | 2 +- encoding/src/cbor.rs | 2 +- encoding/src/errors.rs | 2 +- encoding/src/hash.rs | 2 +- encoding/src/lib.rs | 2 +- ipld/cid/src/codec.rs | 2 +- ipld/cid/src/error.rs | 2 +- ipld/cid/src/lib.rs | 2 +- ipld/cid/src/to_cid.rs | 2 +- ipld/cid/src/version.rs | 2 +- ipld/cid/tests/base_cid_tests.rs | 2 +- ipld/src/lib.rs | 2 +- ipld/tests/ipld_test.rs | 2 +- node/clock/src/lib.rs | 2 +- node/clock/tests/clock_test.rs | 2 +- node/db/src/errors.rs | 2 +- node/db/src/lib.rs | 2 +- node/db/src/memory.rs | 2 +- node/db/src/rocks.rs | 2 +- node/db/tests/db_utils/mod.rs | 2 +- node/db/tests/mem_test.rs | 2 +- node/db/tests/rocks_test.rs | 2 +- node/db/tests/subtests/mod.rs | 2 +- node/forest_libp2p/src/behaviour.rs | 2 +- node/forest_libp2p/src/config.rs | 2 +- node/forest_libp2p/src/lib.rs | 2 +- node/forest_libp2p/src/service.rs | 2 +- node/network/src/lib.rs | 2 +- node/network/src/service.rs | 2 +- node/src/cli/config.rs | 2 +- node/src/cli/mod.rs | 2 +- node/src/log/mod.rs | 2 +- node/src/main.rs | 2 +- node/utils/src/lib.rs | 2 +- node/utils/tests/files.rs | 2 +- scripts/add_license.sh | 4 ++-- scripts/copyright.txt | 3 +++ vm/actor/src/builtin/account.rs | 2 +- vm/actor/src/builtin/cron.rs | 2 +- vm/actor/src/builtin/init.rs | 2 +- vm/actor/src/builtin/mod.rs | 2 +- vm/actor/src/builtin/reward.rs | 2 +- vm/actor/src/builtin/storage_power.rs | 2 +- vm/actor/src/code.rs | 2 +- vm/actor/src/lib.rs | 2 +- vm/address/src/errors.rs | 2 +- vm/address/src/lib.rs | 2 +- vm/address/src/network.rs | 2 +- vm/address/src/protocol.rs | 2 +- vm/address/tests/address_test.rs | 2 +- vm/interpreter/src/lib.rs | 2 +- vm/message/src/lib.rs | 2 +- vm/message/src/message_receipt.rs | 2 +- vm/message/src/signed_message.rs | 2 +- vm/message/src/unsigned_message.rs | 2 +- vm/message/tests/builder_test.rs | 2 +- vm/message/tests/u_message_cbor.rs | 2 +- vm/runtime/src/actor_code.rs | 2 +- vm/runtime/src/lib.rs | 2 +- vm/src/exit_code.rs | 2 +- vm/src/invoc.rs | 2 +- vm/src/lib.rs | 2 +- vm/src/method.rs | 2 +- vm/src/token.rs | 2 +- vm/state_tree/src/lib.rs | 2 +- vm/tests/params_test.rs | 2 +- 101 files changed, 121 insertions(+), 101 deletions(-) rename LICENSE => LICENSE-APACHE (100%) create mode 100644 LICENSE-MIT delete mode 100644 copyright.txt create mode 100644 scripts/copyright.txt diff --git a/LICENSE b/LICENSE-APACHE similarity index 100% rename from LICENSE rename to LICENSE-APACHE diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 000000000000..72dc60d84b69 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,19 @@ +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index 67e0dfa0099a..c89baf33459c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # 🌲 Forest ![](https://github.com/ChainSafe/forest/workflows/Rust%20CI/badge.svg?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![](https://img.shields.io/twitter/follow/espadrine.svg?label=Follow&style=social)](https://twitter.com/chainsafeth) @@ -42,4 +43,4 @@ https://chainsafe.github.io/forest/ - Have questions? Say hi on [Discord](https://discord.gg/Q6A3YA2)! ## License -Forest is licensed under the Apache License 2.0. \ No newline at end of file +Forest is dual licensed under [MIT](https://github.com/ChainSafe/forest/blob/master/LICENSE-MIT) + [Apache 2.0](https://github.com/ChainSafe/forest/blob/master/LICENSE-APACHE). \ No newline at end of file diff --git a/blockchain/blocks/src/block.rs b/blockchain/blocks/src/block.rs index 1429def3acfb..e39667d685d9 100644 --- a/blockchain/blocks/src/block.rs +++ b/blockchain/blocks/src/block.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT #![allow(dead_code)] diff --git a/blockchain/blocks/src/errors.rs b/blockchain/blocks/src/errors.rs index d19b3ea8482f..70c22ee16fec 100644 --- a/blockchain/blocks/src/errors.rs +++ b/blockchain/blocks/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use std::fmt; diff --git a/blockchain/blocks/src/header.rs b/blockchain/blocks/src/header.rs index 3710beaa355e..5c6311e5aa36 100644 --- a/blockchain/blocks/src/header.rs +++ b/blockchain/blocks/src/header.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::{EPostProof, Ticket, TipSetKeys, TxMeta}; use address::Address; diff --git a/blockchain/blocks/src/lib.rs b/blockchain/blocks/src/lib.rs index f9535168a80e..02ba03e6744e 100644 --- a/blockchain/blocks/src/lib.rs +++ b/blockchain/blocks/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod block; mod errors; diff --git a/blockchain/blocks/src/ticket.rs b/blockchain/blocks/src/ticket.rs index 4625b85586b3..2112e5fbbd6f 100644 --- a/blockchain/blocks/src/ticket.rs +++ b/blockchain/blocks/src/ticket.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crypto::VRFResult; use encoding::{ diff --git a/blockchain/blocks/src/tipset.rs b/blockchain/blocks/src/tipset.rs index 0d7dfb5c3822..1198fdca9c54 100644 --- a/blockchain/blocks/src/tipset.rs +++ b/blockchain/blocks/src/tipset.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT #![allow(unused_variables)] #![allow(dead_code)] diff --git a/blockchain/chain/src/lib.rs b/blockchain/chain/src/lib.rs index 092a08cba1f6..d1ac7db3289c 100644 --- a/blockchain/chain/src/lib.rs +++ b/blockchain/chain/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod store; diff --git a/blockchain/chain/src/store/chain_store.rs b/blockchain/chain/src/store/chain_store.rs index fc39b51b1ceb..24ebd5b22759 100644 --- a/blockchain/chain/src/store/chain_store.rs +++ b/blockchain/chain/src/store/chain_store.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::{Error, TipIndex, TipSetMetadata}; use blocks::{BlockHeader, Tipset}; diff --git a/blockchain/chain/src/store/errors.rs b/blockchain/chain/src/store/errors.rs index beef5c100d6b..cb54e9dcbaf2 100644 --- a/blockchain/chain/src/store/errors.rs +++ b/blockchain/chain/src/store/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::Error as BlkErr; use cid::Error as CidErr; diff --git a/blockchain/chain/src/store/mod.rs b/blockchain/chain/src/store/mod.rs index fda31bd70c2d..993fc39e2692 100644 --- a/blockchain/chain/src/store/mod.rs +++ b/blockchain/chain/src/store/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod chain_store; mod errors; diff --git a/blockchain/chain/src/store/tip_index.rs b/blockchain/chain/src/store/tip_index.rs index 52c46a3b990e..157e44950ee3 100644 --- a/blockchain/chain/src/store/tip_index.rs +++ b/blockchain/chain/src/store/tip_index.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::errors::Error; use blocks::{TipSetKeys, Tipset}; diff --git a/blockchain/chain_sync/src/block_msg.rs b/blockchain/chain_sync/src/block_msg.rs index 452f5f16982f..99b64491f66d 100644 --- a/blockchain/chain_sync/src/block_msg.rs +++ b/blockchain/chain_sync/src/block_msg.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::TipSetKeys; use libp2p::PeerId; diff --git a/blockchain/chain_sync/src/block_proposer.rs b/blockchain/chain_sync/src/block_proposer.rs index c836cb8c8194..a292f1d6afa0 100644 --- a/blockchain/chain_sync/src/block_proposer.rs +++ b/blockchain/chain_sync/src/block_proposer.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::BlockMsg; use std::io; diff --git a/blockchain/chain_sync/src/lib.rs b/blockchain/chain_sync/src/lib.rs index 23ee605a60d8..86de12ce7bd3 100644 --- a/blockchain/chain_sync/src/lib.rs +++ b/blockchain/chain_sync/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod block_msg; mod block_proposer; diff --git a/blockchain/raw_block/src/lib.rs b/blockchain/raw_block/src/lib.rs index 6bba15a33307..cf3ea96e6d23 100644 --- a/blockchain/raw_block/src/lib.rs +++ b/blockchain/raw_block/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod raw_block; diff --git a/blockchain/raw_block/src/raw_block.rs b/blockchain/raw_block/src/raw_block.rs index 59982987db4f..76279b5a7b0a 100644 --- a/blockchain/raw_block/src/raw_block.rs +++ b/blockchain/raw_block/src/raw_block.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use cid::{Cid, Codec, Error, Version}; use encoding::{Cbor, Error as EncodingError}; diff --git a/blockchain/src/lib.rs b/blockchain/src/lib.rs index 62bc114fc1ae..ba51310a32ca 100644 --- a/blockchain/src/lib.rs +++ b/blockchain/src/lib.rs @@ -1,4 +1,4 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT pub mod message_pool; diff --git a/blockchain/src/main.rs b/blockchain/src/main.rs index 123181cdd110..d85b315c3dab 100644 --- a/blockchain/src/main.rs +++ b/blockchain/src/main.rs @@ -1,4 +1,4 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT fn main() {} diff --git a/blockchain/src/message_pool/mod.rs b/blockchain/src/message_pool/mod.rs index be97c1238c22..97e61135b0ba 100644 --- a/blockchain/src/message_pool/mod.rs +++ b/blockchain/src/message_pool/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod pool; diff --git a/blockchain/src/message_pool/pool.rs b/blockchain/src/message_pool/pool.rs index 944b73ceaa8e..43a714d24f49 100644 --- a/blockchain/src/message_pool/pool.rs +++ b/blockchain/src/message_pool/pool.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use message::SignedMessage; diff --git a/blockchain/src/storage_consensus/mod.rs b/blockchain/src/storage_consensus/mod.rs index 6e8fee05c477..5cd550574c05 100644 --- a/blockchain/src/storage_consensus/mod.rs +++ b/blockchain/src/storage_consensus/mod.rs @@ -1,3 +1,3 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT diff --git a/blockchain/sync_manager/src/bucket.rs b/blockchain/sync_manager/src/bucket.rs index 78058f8b1adb..6fb25448ea44 100644 --- a/blockchain/sync_manager/src/bucket.rs +++ b/blockchain/sync_manager/src/bucket.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::Tipset; diff --git a/blockchain/sync_manager/src/errors.rs b/blockchain/sync_manager/src/errors.rs index 809ee535f84f..dc7a2a8105b2 100644 --- a/blockchain/sync_manager/src/errors.rs +++ b/blockchain/sync_manager/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::Error as BlkErr; use chain::Error as StoreErr; diff --git a/blockchain/sync_manager/src/lib.rs b/blockchain/sync_manager/src/lib.rs index 4385ff6ae634..c505b6fe97ef 100644 --- a/blockchain/sync_manager/src/lib.rs +++ b/blockchain/sync_manager/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod bucket; mod errors; diff --git a/blockchain/sync_manager/src/manager.rs b/blockchain/sync_manager/src/manager.rs index 28704deb18fe..e557ac770a8e 100644 --- a/blockchain/sync_manager/src/manager.rs +++ b/blockchain/sync_manager/src/manager.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::bucket::SyncBucketSet; use blocks::Tipset; diff --git a/blockchain/sync_manager/src/sync.rs b/blockchain/sync_manager/src/sync.rs index a34f1304e295..342b4164a9e4 100644 --- a/blockchain/sync_manager/src/sync.rs +++ b/blockchain/sync_manager/src/sync.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT #![allow(dead_code)] diff --git a/blockchain/sync_manager/tests/manager_test.rs b/blockchain/sync_manager/tests/manager_test.rs index 57d941322960..ef4603c7e7f3 100644 --- a/blockchain/sync_manager/tests/manager_test.rs +++ b/blockchain/sync_manager/tests/manager_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::{BlockHeader, Tipset}; use cid::Cid; diff --git a/copyright.txt b/copyright.txt deleted file mode 100644 index 6e8fee05c477..000000000000 --- a/copyright.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 - diff --git a/crypto/src/errors.rs b/crypto/src/errors.rs index 9f53865dbca2..557428e3bee3 100644 --- a/crypto/src/errors.rs +++ b/crypto/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Error as AddressError; use encoding::Error as EncodingError; diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs index 6a842e4f9180..b96b892c019d 100644 --- a/crypto/src/lib.rs +++ b/crypto/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod errors; mod signature; diff --git a/crypto/src/signature.rs b/crypto/src/signature.rs index a51955939b16..c953cb82d507 100644 --- a/crypto/src/signature.rs +++ b/crypto/src/signature.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::errors::Error; use address::{Address, Protocol}; diff --git a/crypto/src/signer.rs b/crypto/src/signer.rs index b1620052693d..7d8a7605d3da 100644 --- a/crypto/src/signer.rs +++ b/crypto/src/signer.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::signature::Signature; use address::Address; diff --git a/crypto/src/vrf.rs b/crypto/src/vrf.rs index 69ea03d233df..16bf75c76131 100644 --- a/crypto/src/vrf.rs +++ b/crypto/src/vrf.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::signature::{verify_bls_sig, Signature, BLS_SIG_LEN}; use bls_signatures::{Serialize as BlsSerialize, Signature as BLSSignature}; diff --git a/encoding/src/cbor.rs b/encoding/src/cbor.rs index 52683f6a7413..bf9374156492 100644 --- a/encoding/src/cbor.rs +++ b/encoding/src/cbor.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::errors::Error; use crate::{ser, to_vec}; diff --git a/encoding/src/errors.rs b/encoding/src/errors.rs index 08a9a9878579..9c42517867a5 100644 --- a/encoding/src/errors.rs +++ b/encoding/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use serde_cbor::error::Error as CborError; use std::fmt; diff --git a/encoding/src/hash.rs b/encoding/src/hash.rs index 2dbfe288d3da..3733aa217c35 100644 --- a/encoding/src/hash.rs +++ b/encoding/src/hash.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blake2b_simd::Params; diff --git a/encoding/src/lib.rs b/encoding/src/lib.rs index 1cb661a92422..1e1b421f62c8 100644 --- a/encoding/src/lib.rs +++ b/encoding/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod cbor; mod errors; diff --git a/ipld/cid/src/codec.rs b/ipld/cid/src/codec.rs index 1823faf0fe02..29f0030cd17d 100644 --- a/ipld/cid/src/codec.rs +++ b/ipld/cid/src/codec.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::Error; diff --git a/ipld/cid/src/error.rs b/ipld/cid/src/error.rs index 0e5a3503e858..38f8f1fafd32 100644 --- a/ipld/cid/src/error.rs +++ b/ipld/cid/src/error.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use encoding::Error as EncodingError; use multibase; diff --git a/ipld/cid/src/lib.rs b/ipld/cid/src/lib.rs index ba94ff3e61f9..b5d8734a722d 100644 --- a/ipld/cid/src/lib.rs +++ b/ipld/cid/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod codec; mod error; diff --git a/ipld/cid/src/to_cid.rs b/ipld/cid/src/to_cid.rs index 8c27360c59e3..a66a6bc4ca8e 100644 --- a/ipld/cid/src/to_cid.rs +++ b/ipld/cid/src/to_cid.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::{Cid, Codec, Error, Version}; use integer_encoding::VarIntReader; diff --git a/ipld/cid/src/version.rs b/ipld/cid/src/version.rs index b8e4beab2ff0..75bd6e9168ff 100644 --- a/ipld/cid/src/version.rs +++ b/ipld/cid/src/version.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::Error; diff --git a/ipld/cid/tests/base_cid_tests.rs b/ipld/cid/tests/base_cid_tests.rs index 1b4b461a7d0d..cb69529fe445 100644 --- a/ipld/cid/tests/base_cid_tests.rs +++ b/ipld/cid/tests/base_cid_tests.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use encoding::{from_slice, to_vec, Cbor}; use forest_cid::{Cid, Codec, Error, Prefix, Version}; diff --git a/ipld/src/lib.rs b/ipld/src/lib.rs index 72c2f74ee1fa..b9102e97140a 100644 --- a/ipld/src/lib.rs +++ b/ipld/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use cid::Cid; use encoding::de; diff --git a/ipld/tests/ipld_test.rs b/ipld/tests/ipld_test.rs index daccad940c98..bf5593c48add 100644 --- a/ipld/tests/ipld_test.rs +++ b/ipld/tests/ipld_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use cid::Cid; use encoding::{from_slice, to_vec}; diff --git a/node/clock/src/lib.rs b/node/clock/src/lib.rs index a899499d1e81..bac37e26ea43 100644 --- a/node/clock/src/lib.rs +++ b/node/clock/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc}; use serde::{Deserialize, Serialize}; diff --git a/node/clock/tests/clock_test.rs b/node/clock/tests/clock_test.rs index 1c73a1fc21f3..20b662b51f52 100644 --- a/node/clock/tests/clock_test.rs +++ b/node/clock/tests/clock_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use clock::ChainEpochClock; diff --git a/node/db/src/errors.rs b/node/db/src/errors.rs index edab6a62e9b9..a8f4a4d99571 100644 --- a/node/db/src/errors.rs +++ b/node/db/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use blocks::Error as BlkErr; use encoding::Error as EncErr; diff --git a/node/db/src/lib.rs b/node/db/src/lib.rs index fa8caee8c828..7b5d27428e10 100644 --- a/node/db/src/lib.rs +++ b/node/db/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod errors; mod memory; diff --git a/node/db/src/memory.rs b/node/db/src/memory.rs index 92cf1e65a178..fd41df862d57 100644 --- a/node/db/src/memory.rs +++ b/node/db/src/memory.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::Error; use super::{DatabaseService, Read, Write}; diff --git a/node/db/src/rocks.rs b/node/db/src/rocks.rs index 53018b69265f..26a884b10f50 100644 --- a/node/db/src/rocks.rs +++ b/node/db/src/rocks.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::errors::Error; use super::{DatabaseService, Read, Write}; diff --git a/node/db/tests/db_utils/mod.rs b/node/db/tests/db_utils/mod.rs index e300a262737f..adf8ce567dd2 100644 --- a/node/db/tests/db_utils/mod.rs +++ b/node/db/tests/db_utils/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT // Taken from // https://github.com/rust-rocksdb/rust-rocksdb/blob/master/tests/util/mod.rs diff --git a/node/db/tests/mem_test.rs b/node/db/tests/mem_test.rs index 49d396a66ec6..fb8fe738f617 100644 --- a/node/db/tests/mem_test.rs +++ b/node/db/tests/mem_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod subtests; diff --git a/node/db/tests/rocks_test.rs b/node/db/tests/rocks_test.rs index f05a57d7aa10..fa1f1cfdb175 100644 --- a/node/db/tests/rocks_test.rs +++ b/node/db/tests/rocks_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod db_utils; mod subtests; diff --git a/node/db/tests/subtests/mod.rs b/node/db/tests/subtests/mod.rs index a2a93e4be24c..d9f7d9f9825a 100644 --- a/node/db/tests/subtests/mod.rs +++ b/node/db/tests/subtests/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use db::{DatabaseService, Read, Write}; diff --git a/node/forest_libp2p/src/behaviour.rs b/node/forest_libp2p/src/behaviour.rs index 8f8a1c3c3799..8820d1dc7c1e 100644 --- a/node/forest_libp2p/src/behaviour.rs +++ b/node/forest_libp2p/src/behaviour.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use futures::Async; use libp2p::core::identity::Keypair; diff --git a/node/forest_libp2p/src/config.rs b/node/forest_libp2p/src/config.rs index f767637cb496..18b635286fe1 100644 --- a/node/forest_libp2p/src/config.rs +++ b/node/forest_libp2p/src/config.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use libp2p::gossipsub::Topic; use serde::Deserialize; diff --git a/node/forest_libp2p/src/lib.rs b/node/forest_libp2p/src/lib.rs index e760ea9105a6..2e51eec7c8aa 100644 --- a/node/forest_libp2p/src/lib.rs +++ b/node/forest_libp2p/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT pub mod behaviour; pub mod config; diff --git a/node/forest_libp2p/src/service.rs b/node/forest_libp2p/src/service.rs index cdfa26f90beb..08cbd086bfe2 100644 --- a/node/forest_libp2p/src/service.rs +++ b/node/forest_libp2p/src/service.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::behaviour::{MyBehaviour, MyBehaviourEvent}; use super::config::Libp2pConfig; diff --git a/node/network/src/lib.rs b/node/network/src/lib.rs index 4c5d0e494ec3..2cb44611e5cf 100644 --- a/node/network/src/lib.rs +++ b/node/network/src/lib.rs @@ -1,4 +1,4 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT pub mod service; diff --git a/node/network/src/service.rs b/node/network/src/service.rs index 49f223e543a1..d0719f0a08cf 100644 --- a/node/network/src/service.rs +++ b/node/network/src/service.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use forest_libp2p::config::Libp2pConfig; use forest_libp2p::service::{Libp2pService, NetworkEvent}; diff --git a/node/src/cli/config.rs b/node/src/cli/config.rs index fe6df56f449e..5c4d7020300d 100644 --- a/node/src/cli/config.rs +++ b/node/src/cli/config.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use forest_libp2p::config::Libp2pConfig; use serde::Deserialize; diff --git a/node/src/cli/mod.rs b/node/src/cli/mod.rs index fc35127af1f8..4c525b8fef36 100644 --- a/node/src/cli/mod.rs +++ b/node/src/cli/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod config; diff --git a/node/src/log/mod.rs b/node/src/log/mod.rs index bf306f9729e7..cedbb660d070 100644 --- a/node/src/log/mod.rs +++ b/node/src/log/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use slog::Drain; use slog::*; diff --git a/node/src/main.rs b/node/src/main.rs index 246bdd643d51..cf78d72eb033 100644 --- a/node/src/main.rs +++ b/node/src/main.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod cli; mod log; diff --git a/node/utils/src/lib.rs b/node/utils/src/lib.rs index e2d5fd8548f0..b3f50cb98233 100644 --- a/node/utils/src/lib.rs +++ b/node/utils/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use dirs::home_dir; use std::fs::{create_dir_all, File}; diff --git a/node/utils/tests/files.rs b/node/utils/tests/files.rs index 60082654628b..b8d500c980ed 100644 --- a/node/utils/tests/files.rs +++ b/node/utils/tests/files.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use utils::{read_file_to_string, read_file_to_vec, read_toml, write_to_file}; diff --git a/scripts/add_license.sh b/scripts/add_license.sh index 891c49378cfe..de99d238fede 100755 --- a/scripts/add_license.sh +++ b/scripts/add_license.sh @@ -1,13 +1,13 @@ #!/usr/bin/env sh -PAT_APA="^// Copyright 2020 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0$" +PAT_APA="^// Copyright 2020 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT$" valid=true for file in $(find . -type f -not -path "./target/*" | egrep '\.(rs)$'); do header=$(echo $(head -3 $file)) if ! echo "$header" | grep -q "$PAT_APA"; then echo "$file was missing header" - cat copyright.txt $file > temp + cat ./scripts/copyright.txt $file > temp mv temp $file valid=false fi diff --git a/scripts/copyright.txt b/scripts/copyright.txt new file mode 100644 index 000000000000..5cd550574c05 --- /dev/null +++ b/scripts/copyright.txt @@ -0,0 +1,3 @@ +// Copyright 2020 ChainSafe Systems +// SPDX-License-Identifier: Apache-2.0, MIT + diff --git a/vm/actor/src/builtin/account.rs b/vm/actor/src/builtin/account.rs index 7153ac49ceb3..b755fc009960 100644 --- a/vm/actor/src/builtin/account.rs +++ b/vm/actor/src/builtin/account.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use num_derive::FromPrimitive; diff --git a/vm/actor/src/builtin/cron.rs b/vm/actor/src/builtin/cron.rs index 70461b423081..222a74b87946 100644 --- a/vm/actor/src/builtin/cron.rs +++ b/vm/actor/src/builtin/cron.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use vm::{ ExitCode, InvocInput, InvocOutput, MethodNum, Serialized, SysCode, TokenAmount, diff --git a/vm/actor/src/builtin/init.rs b/vm/actor/src/builtin/init.rs index 509760a2caf4..f4dd9a85a6be 100644 --- a/vm/actor/src/builtin/init.rs +++ b/vm/actor/src/builtin/init.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::{ActorID, CodeID}; use vm::{ diff --git a/vm/actor/src/builtin/mod.rs b/vm/actor/src/builtin/mod.rs index fa674eaae47a..af79795aaed6 100644 --- a/vm/actor/src/builtin/mod.rs +++ b/vm/actor/src/builtin/mod.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod account; mod cron; diff --git a/vm/actor/src/builtin/reward.rs b/vm/actor/src/builtin/reward.rs index c57190a1411a..f9baba161e3d 100644 --- a/vm/actor/src/builtin/reward.rs +++ b/vm/actor/src/builtin/reward.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use clock::ChainEpoch; diff --git a/vm/actor/src/builtin/storage_power.rs b/vm/actor/src/builtin/storage_power.rs index e21504fdfa1c..9eda74ce263b 100644 --- a/vm/actor/src/builtin/storage_power.rs +++ b/vm/actor/src/builtin/storage_power.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use num_bigint::BigUint; use num_derive::FromPrimitive; diff --git a/vm/actor/src/code.rs b/vm/actor/src/code.rs index 5cd2696c79e6..20674f29b902 100644 --- a/vm/actor/src/code.rs +++ b/vm/actor/src/code.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use cid::Cid; diff --git a/vm/actor/src/lib.rs b/vm/actor/src/lib.rs index d7563c515b9d..4c43ab412650 100644 --- a/vm/actor/src/lib.rs +++ b/vm/actor/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod builtin; mod code; diff --git a/vm/address/src/errors.rs b/vm/address/src/errors.rs index 9df4c78e6dd3..e0f66cb3ed02 100644 --- a/vm/address/src/errors.rs +++ b/vm/address/src/errors.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::{BLS_PUB_LEN, PAYLOAD_HASH_LEN}; use data_encoding::DecodeError; diff --git a/vm/address/src/lib.rs b/vm/address/src/lib.rs index e98eebdb150b..ec7f43105c2d 100644 --- a/vm/address/src/lib.rs +++ b/vm/address/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod errors; mod network; diff --git a/vm/address/src/network.rs b/vm/address/src/network.rs index cdeff0bf546e..bf9c23f31a7d 100644 --- a/vm/address/src/network.rs +++ b/vm/address/src/network.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::{MAINNET_PREFIX, TESTNET_PREFIX}; diff --git a/vm/address/src/protocol.rs b/vm/address/src/protocol.rs index ba9ba902cb43..62e379a093a4 100644 --- a/vm/address/src/protocol.rs +++ b/vm/address/src/protocol.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use num_derive::FromPrimitive; use num_traits::FromPrimitive; diff --git a/vm/address/tests/address_test.rs b/vm/address/tests/address_test.rs index a5f34e7ed8a0..656cf7beef55 100644 --- a/vm/address/tests/address_test.rs +++ b/vm/address/tests/address_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use encoding::{from_slice, Cbor}; use forest_address::{ diff --git a/vm/interpreter/src/lib.rs b/vm/interpreter/src/lib.rs index 2c0c723214fa..38dfa3d1512e 100644 --- a/vm/interpreter/src/lib.rs +++ b/vm/interpreter/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use blocks::Tipset; diff --git a/vm/message/src/lib.rs b/vm/message/src/lib.rs index 44b53d111399..f2e3fb2ea697 100644 --- a/vm/message/src/lib.rs +++ b/vm/message/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod message_receipt; mod signed_message; diff --git a/vm/message/src/message_receipt.rs b/vm/message/src/message_receipt.rs index f3ee53dff53b..5dfe8bab0ab3 100644 --- a/vm/message/src/message_receipt.rs +++ b/vm/message/src/message_receipt.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use num_bigint::BigUint; use vm::ExitCode; diff --git a/vm/message/src/signed_message.rs b/vm/message/src/signed_message.rs index 555f62890477..ef70fe416cb2 100644 --- a/vm/message/src/signed_message.rs +++ b/vm/message/src/signed_message.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::{Message, UnsignedMessage}; use address::Address; diff --git a/vm/message/src/unsigned_message.rs b/vm/message/src/unsigned_message.rs index 76dbc1ac0901..29c272236d11 100644 --- a/vm/message/src/unsigned_message.rs +++ b/vm/message/src/unsigned_message.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use super::Message; use address::Address; diff --git a/vm/message/tests/builder_test.rs b/vm/message/tests/builder_test.rs index 7f7281a90515..daba00f33b84 100644 --- a/vm/message/tests/builder_test.rs +++ b/vm/message/tests/builder_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use crypto::{Signature, Signer}; diff --git a/vm/message/tests/u_message_cbor.rs b/vm/message/tests/u_message_cbor.rs index 6413f11737de..ac58249176e9 100644 --- a/vm/message/tests/u_message_cbor.rs +++ b/vm/message/tests/u_message_cbor.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use encoding::{from_slice, to_vec}; diff --git a/vm/runtime/src/actor_code.rs b/vm/runtime/src/actor_code.rs index 9d09167204e7..c12c41ae618e 100644 --- a/vm/runtime/src/actor_code.rs +++ b/vm/runtime/src/actor_code.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::Runtime; use vm::{InvocOutput, MethodNum, Serialized}; diff --git a/vm/runtime/src/lib.rs b/vm/runtime/src/lib.rs index 126493f13d06..7b1f5ef746ae 100644 --- a/vm/runtime/src/lib.rs +++ b/vm/runtime/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT #![allow(dead_code)] mod actor_code; diff --git a/vm/src/exit_code.rs b/vm/src/exit_code.rs index 3396451fcf6a..ecf898e9b3ef 100644 --- a/vm/src/exit_code.rs +++ b/vm/src/exit_code.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT /// ExitCode defines the exit code from the VM execution #[derive(PartialEq, Eq, Debug, Clone)] diff --git a/vm/src/invoc.rs b/vm/src/invoc.rs index 7f721ad7db5d..35a0b5cc53fb 100644 --- a/vm/src/invoc.rs +++ b/vm/src/invoc.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use crate::{ExitCode, MethodNum, Serialized, TokenAmount}; diff --git a/vm/src/lib.rs b/vm/src/lib.rs index 5fdc08348d98..effe8f452a4c 100644 --- a/vm/src/lib.rs +++ b/vm/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT mod exit_code; mod invoc; diff --git a/vm/src/method.rs b/vm/src/method.rs index 6f5bbf02105a..5193d091511d 100644 --- a/vm/src/method.rs +++ b/vm/src/method.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use encoding::{de, ser, serde_bytes, to_vec, Error as EncodingError}; use serde::{Deserialize, Serialize}; diff --git a/vm/src/token.rs b/vm/src/token.rs index 532784447bac..f20f36acaa29 100644 --- a/vm/src/token.rs +++ b/vm/src/token.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use encoding::{de, ser}; use num_bigint::BigUint; diff --git a/vm/state_tree/src/lib.rs b/vm/state_tree/src/lib.rs index 45a22d167fc5..0f53e34cb49f 100644 --- a/vm/state_tree/src/lib.rs +++ b/vm/state_tree/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use actor::ActorState; use address::Address; diff --git a/vm/tests/params_test.rs b/vm/tests/params_test.rs index 7b26592a6cdd..73868586fef8 100644 --- a/vm/tests/params_test.rs +++ b/vm/tests/params_test.rs @@ -1,5 +1,5 @@ // Copyright 2020 ChainSafe Systems -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0, MIT use address::Address; use encoding::{from_slice, to_vec};