Fix licenses and CI (#593)

.cargo/config → .cargo/config.toml

@@ -8,7 +8,6 @@ xclippy = [
     "-Wclippy::all",
     "-Wclippy::disallowed_methods",
 ]
-xlint = "run --package x --bin x -- lint"
 xtest = "run --package x --bin x -- external-crates-tests"
 
 # Configuration specifically for running clippy on `external-crates/move/`.
@@ -26,6 +25,8 @@ move-clippy = [
     "-Aclippy::manual_slice_size_calculation",
 ]
 
+ci-license = "license-template --template .license_template"
+
 [build]
 rustflags = ["-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
 

.github/workflows/rust.yml

@@ -58,12 +58,12 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # Pin v4.1.1
       - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@1cd874a5478fdca35d868ccc74640c5aabbb8f1b # [email protected]
-        with:
-          crate: cargo-hakari
-          locked: true
-      - run: cargo xlint
+
+      - name: Install cargo-license-template
+        run: cargo install --force cargo-license-template
+
+      - name: Run cargo-license-template
+        run: cargo ci-license
 
   release-notes-description-check:
     name: release-notes-check

.license_template

@@ -0,0 +1,2 @@
+{(\/\/ Copyright.*\n)*?}// {(Modifications )?}Copyright (c) {20\d{2}(-20\d{2})?} IOTA Stiftung
+{(\/\/ Copyright.*\n)*}// SPDX-License-Identifier: Apache-2.0

crates/iota-genesis-builder/src/stardust/types/nft.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
 use anyhow::anyhow;
 use iota_protocol_config::ProtocolConfig;
 use iota_sdk::types::block::output::{

crates/iota-genesis-builder/src/stardust/types/output.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
 //! Rust types and logic for the Move counterparts in the `stardust` system
 //! package.
 

crates/iota-graphql-rpc/src/types/transaction_block.rs

@@ -1,8 +1,9 @@
-use std::collections::{BTreeMap, BTreeSet};
-
 // Copyright (c) Mysten Labs, Inc.
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
+
+use std::collections::{BTreeMap, BTreeSet};
+
 use async_graphql::{
     connection::{Connection, CursorType, Edge},
     *,

crates/transaction-fuzzer/src/account_universe.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/src/account_universe/account.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/src/account_universe/helpers.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/src/account_universe/transfer_gen.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/src/account_universe/universe.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/src/executor.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/transaction-fuzzer/tests/p2p_fuzz.rs

@@ -1,6 +1,4 @@
 // Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
 // Copyright (c) The Diem Core Contributors
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0

crates/x/src/lint.rs

@@ -1,4 +1,5 @@
 // Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::anyhow;

narwhal/primary/src/tests/common.rs

@@ -1,8 +1,9 @@
-use std::num::NonZeroUsize;
-
 // Copyright (c) Mysten Labs, Inc.
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
+
+use std::num::NonZeroUsize;
+
 use config::{AuthorityIdentifier, WorkerId};
 use storage::{CertificateStore, CertificateStoreCache, PayloadStore, PayloadToken};
 use store::{

narwhal/primary/src/tests/proposer_tests.rs

@@ -2,6 +2,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
+
 use indexmap::IndexMap;
 use prometheus::Registry;
 use test_utils::{fixture_payload, latest_protocol_version, CommitteeFixture};