From 45aeeb8e0b049d904e323cca6de066639086717d Mon Sep 17 00:00:00 2001 From: Malte Kliemann Date: Sun, 13 Oct 2024 21:29:29 +0200 Subject: [PATCH] Update copyright notices (#1373) * Add licenses * Add remark about LGPL-3.0 licensing by Gnosis --- zrml/combinatorial-tokens/src/lib.rs | 8 ++++++ zrml/combinatorial-tokens/src/mock/consts.rs | 3 +-- .../src/mock/ext_builder.rs | 19 ++++++++++++-- zrml/combinatorial-tokens/src/mock/mod.rs | 17 ++++++++++++- zrml/combinatorial-tokens/src/mock/runtime.rs | 19 ++++++++++++-- .../src/tests/integration.rs | 17 ++++++++++++- .../src/tests/merge_position.rs | 18 +++++++++++-- zrml/combinatorial-tokens/src/tests/mod.rs | 17 ++++++++++++- .../src/tests/split_position.rs | 17 ++++++++++++- .../src/traits/combinatorial_id_manager.rs | 25 ++++++++++++++++++- zrml/combinatorial-tokens/src/traits/mod.rs | 17 ++++++++++++- .../decompressor/mod.rs | 25 +++++++++++++++++-- .../tests/decompress_collection_id.rs | 18 +++++++++++-- .../decompressor/tests/decompress_hash.rs | 18 +++++++++++-- .../decompressor/tests/get_collection_id.rs | 18 +++++++++++-- .../tests/matching_y_coordinate.rs | 18 +++++++++++-- .../decompressor/tests/mod.rs | 17 ++++++++++++- .../decompressor/tests/pow_magic_number.rs | 18 +++++++++++-- .../cryptographic_id_manager/hash_tuple.rs | 19 ++++++++++++-- .../src/types/cryptographic_id_manager/mod.rs | 25 +++++++++++++++++-- zrml/combinatorial-tokens/src/types/hash.rs | 1 - zrml/combinatorial-tokens/src/types/mod.rs | 18 +++++++++++-- zrml/neo-swaps/src/math/types/mod.rs | 18 +++++++++++-- zrml/neo-swaps/src/tests/buy_and_sell.rs | 2 +- 24 files changed, 355 insertions(+), 37 deletions(-) delete mode 100644 zrml/combinatorial-tokens/src/types/hash.rs diff --git a/zrml/combinatorial-tokens/src/lib.rs b/zrml/combinatorial-tokens/src/lib.rs index 4c8c08b97..f12e77c2b 100644 --- a/zrml/combinatorial-tokens/src/lib.rs +++ b/zrml/combinatorial-tokens/src/lib.rs @@ -14,6 +14,14 @@ // // You should have received a copy of the GNU General Public License // along with Zeitgeist. If not, see . +// +// This file incorporates work licensed under the GNU Lesser General +// Public License 3.0 but published without copyright notice by Gnosis +// (, info@gnosis.io) in the +// conditional-tokens-contracts repository +// , +// and has been relicensed under GPL-3.0-or-later in this repository. + // TODO Refactor so that collection IDs are their own type with an `Fq` field and an `odd` field? diff --git a/zrml/combinatorial-tokens/src/mock/consts.rs b/zrml/combinatorial-tokens/src/mock/consts.rs index 6aecaf6f8..d4f1be3c2 100644 --- a/zrml/combinatorial-tokens/src/mock/consts.rs +++ b/zrml/combinatorial-tokens/src/mock/consts.rs @@ -1,5 +1,4 @@ -#[cfg(feature = "parachain")] -use zeitgeist_primitives::types::{Asset, MarketId}; +// Copyright 2024 Forecasting Technologies LTD. #[cfg(feature = "parachain")] pub(crate) const FOREIGN_ASSET: Asset = Asset::ForeignAsset(1); diff --git a/zrml/combinatorial-tokens/src/mock/ext_builder.rs b/zrml/combinatorial-tokens/src/mock/ext_builder.rs index 7a12e7d41..9fec5aaef 100644 --- a/zrml/combinatorial-tokens/src/mock/ext_builder.rs +++ b/zrml/combinatorial-tokens/src/mock/ext_builder.rs @@ -1,5 +1,20 @@ -use crate::mock::runtime::{Runtime, System}; -use sp_io::TestExternalities; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . + use sp_runtime::BuildStorage; #[cfg(feature = "parachain")] diff --git a/zrml/combinatorial-tokens/src/mock/mod.rs b/zrml/combinatorial-tokens/src/mock/mod.rs index f0140b64e..ab40046ad 100644 --- a/zrml/combinatorial-tokens/src/mock/mod.rs +++ b/zrml/combinatorial-tokens/src/mock/mod.rs @@ -1,4 +1,19 @@ -#![cfg(feature = "mock")] +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . pub(crate) mod consts; pub mod ext_builder; diff --git a/zrml/combinatorial-tokens/src/mock/runtime.rs b/zrml/combinatorial-tokens/src/mock/runtime.rs index 07c9c6a54..e66a929d8 100644 --- a/zrml/combinatorial-tokens/src/mock/runtime.rs +++ b/zrml/combinatorial-tokens/src/mock/runtime.rs @@ -1,5 +1,20 @@ -use crate as zrml_combinatorial_tokens; -use crate::types::CryptographicIdManager; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . + use frame_support::{construct_runtime, traits::Everything, Blake2_256}; use frame_system::mocking::MockBlock; use sp_runtime::traits::{BlakeTwo256, ConstU32, IdentityLookup}; diff --git a/zrml/combinatorial-tokens/src/tests/integration.rs b/zrml/combinatorial-tokens/src/tests/integration.rs index db95a2b6b..38d6020a6 100644 --- a/zrml/combinatorial-tokens/src/tests/integration.rs +++ b/zrml/combinatorial-tokens/src/tests/integration.rs @@ -1,4 +1,19 @@ -use super::*; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[test] fn split_followed_by_merge_vertical_no_parent() { diff --git a/zrml/combinatorial-tokens/src/tests/merge_position.rs b/zrml/combinatorial-tokens/src/tests/merge_position.rs index 5b9f8bea0..40c8869cf 100644 --- a/zrml/combinatorial-tokens/src/tests/merge_position.rs +++ b/zrml/combinatorial-tokens/src/tests/merge_position.rs @@ -1,5 +1,19 @@ -use super::*; -use test_case::test_case; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[test_case( Asset::Ztg, diff --git a/zrml/combinatorial-tokens/src/tests/mod.rs b/zrml/combinatorial-tokens/src/tests/mod.rs index 4f0bd785c..8eab9ea5c 100644 --- a/zrml/combinatorial-tokens/src/tests/mod.rs +++ b/zrml/combinatorial-tokens/src/tests/mod.rs @@ -1,4 +1,19 @@ -#![cfg(all(feature = "mock", test))] +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . mod integration; mod merge_position; diff --git a/zrml/combinatorial-tokens/src/tests/split_position.rs b/zrml/combinatorial-tokens/src/tests/split_position.rs index 7109fc13d..0191fb57d 100644 --- a/zrml/combinatorial-tokens/src/tests/split_position.rs +++ b/zrml/combinatorial-tokens/src/tests/split_position.rs @@ -1,4 +1,19 @@ -use super::*; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[test] fn split_position_works_vertical_no_parent() { diff --git a/zrml/combinatorial-tokens/src/traits/combinatorial_id_manager.rs b/zrml/combinatorial-tokens/src/traits/combinatorial_id_manager.rs index 847c91fbc..18614d582 100644 --- a/zrml/combinatorial-tokens/src/traits/combinatorial_id_manager.rs +++ b/zrml/combinatorial-tokens/src/traits/combinatorial_id_manager.rs @@ -1,4 +1,27 @@ -use alloc::vec::Vec; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . +// +// This file incorporates work licensed under the GNU Lesser General +// Public License 3.0 but published without copyright notice by Gnosis +// (, info@gnosis.io) in the +// conditional-tokens-contracts repository +// , +// and has been relicensed under GPL-3.0-or-later in this repository. + pub trait CombinatorialIdManager { type Asset; diff --git a/zrml/combinatorial-tokens/src/traits/mod.rs b/zrml/combinatorial-tokens/src/traits/mod.rs index 98642f028..2fdd5ba4f 100644 --- a/zrml/combinatorial-tokens/src/traits/mod.rs +++ b/zrml/combinatorial-tokens/src/traits/mod.rs @@ -1,3 +1,18 @@ -mod combinatorial_id_manager; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . pub use combinatorial_id_manager::CombinatorialIdManager; diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/mod.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/mod.rs index 6495589c3..392ae3c39 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/mod.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/mod.rs @@ -1,5 +1,26 @@ -/// Highest/lowest bit always refers to the big endian representation of each bit sequence. -mod tests; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . +// +// This file incorporates work licensed under the GNU Lesser General +// Public License 3.0 but published without copyright notice by Gnosis +// (, info@gnosis.io) in the +// conditional-tokens-contracts repository +// , +// and has been relicensed under GPL-3.0-or-later in this repository. use ark_bn254::{g1::G1Affine, Fq}; use ark_ff::{BigInteger, PrimeField}; diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_collection_id.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_collection_id.rs index d93b25645..33a6c4ecf 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_collection_id.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_collection_id.rs @@ -1,5 +1,19 @@ -use super::*; -use test_case::test_case; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[test_case( [0x16, 0x74, 0xab, 0x10, 0xed, 0xf8, 0xc4, 0xe2, 0x25, 0x72, 0x9e, 0x20, 0x9a, 0x58, 0x75, 0xa1, 0x9f, 0x14, 0x46, 0xba, 0xec, 0x3b, 0x30, 0xdf, 0x9b, 0xa8, 0x65, 0x75, 0xd5, 0x2d, 0xe3, 0xd3], diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_hash.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_hash.rs index f8cedde5b..2535b478e 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_hash.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/decompress_hash.rs @@ -1,5 +1,19 @@ -use super::*; -use rstest::rstest; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[rstest] #[case( diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/get_collection_id.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/get_collection_id.rs index 6c214ec97..8840c1577 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/get_collection_id.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/get_collection_id.rs @@ -1,5 +1,19 @@ -use super::*; -use rstest::rstest; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . // Gnosis test cases using mocked keccak256 results, found here: https://docs.gnosis.io/conditionaltokens/docs/devguide05 #[rstest] diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/matching_y_coordinate.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/matching_y_coordinate.rs index fc31a3685..6c6ba741a 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/matching_y_coordinate.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/matching_y_coordinate.rs @@ -1,5 +1,19 @@ -use super::*; -use test_case::test_case; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . // Empty string in the `expected` argument signals `None`. #[test_case("0x00", "")] diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/mod.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/mod.rs index 9097b9364..5fda00d14 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/mod.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/mod.rs @@ -1,4 +1,19 @@ -#![cfg(test)] +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . use super::*; diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/pow_magic_number.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/pow_magic_number.rs index f42582800..a76eca901 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/pow_magic_number.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/decompressor/tests/pow_magic_number.rs @@ -1,5 +1,19 @@ -use super::*; -use test_case::test_case; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . #[test_case("0x0", "0x0")] #[test_case("0x1", "0x1")] diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/hash_tuple.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/hash_tuple.rs index 0aabbeccf..46377fdad 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/hash_tuple.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/hash_tuple.rs @@ -1,5 +1,20 @@ -use crate::types::Hash256; -use alloc::{vec, vec::Vec}; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . + use frame_support::{Blake2_256, StorageHasher}; use parity_scale_codec::Encode; use zeitgeist_primitives::types::Asset; diff --git a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/mod.rs b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/mod.rs index 18c8993ef..10ca64d8f 100644 --- a/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/mod.rs +++ b/zrml/combinatorial-tokens/src/types/cryptographic_id_manager/mod.rs @@ -1,5 +1,26 @@ -mod decompressor; -mod hash_tuple; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . +// +// This file incorporates work licensed under the GNU Lesser General +// Public License 3.0 but published without copyright notice by Gnosis +// (, info@gnosis.io) in the +// conditional-tokens-contracts repository +// , +// and has been relicensed under GPL-3.0-or-later in this repository. use crate::traits::CombinatorialIdManager; use alloc::vec::Vec; diff --git a/zrml/combinatorial-tokens/src/types/hash.rs b/zrml/combinatorial-tokens/src/types/hash.rs deleted file mode 100644 index bc57e98ec..000000000 --- a/zrml/combinatorial-tokens/src/types/hash.rs +++ /dev/null @@ -1 +0,0 @@ -pub type Hash256 = [u8; 32]; diff --git a/zrml/combinatorial-tokens/src/types/mod.rs b/zrml/combinatorial-tokens/src/types/mod.rs index a4d7d01fb..108ebf78b 100644 --- a/zrml/combinatorial-tokens/src/types/mod.rs +++ b/zrml/combinatorial-tokens/src/types/mod.rs @@ -1,5 +1,19 @@ -pub(crate) mod cryptographic_id_manager; -pub(crate) mod hash; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . pub use cryptographic_id_manager::CryptographicIdManager; pub(crate) use hash::Hash256; diff --git a/zrml/neo-swaps/src/math/types/mod.rs b/zrml/neo-swaps/src/math/types/mod.rs index 43275d80f..d641dc96f 100644 --- a/zrml/neo-swaps/src/math/types/mod.rs +++ b/zrml/neo-swaps/src/math/types/mod.rs @@ -1,5 +1,19 @@ -mod combo_math; -mod math; +// Copyright 2024 Forecasting Technologies LTD. +// +// This file is part of Zeitgeist. +// +// Zeitgeist is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// Zeitgeist is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Zeitgeist. If not, see . pub(crate) use combo_math::ComboMath; pub(crate) use math::Math; diff --git a/zrml/neo-swaps/src/tests/buy_and_sell.rs b/zrml/neo-swaps/src/tests/buy_and_sell.rs index 3d29969a3..8b596e725 100644 --- a/zrml/neo-swaps/src/tests/buy_and_sell.rs +++ b/zrml/neo-swaps/src/tests/buy_and_sell.rs @@ -1,4 +1,4 @@ -// Copyright 2023 Forecasting Technologies LTD. +// Copyright 2023-2024 Forecasting Technologies LTD. // // This file is part of Zeitgeist. //