From 5c6010a336bbc1b8a32716b4c160760fa44119b8 Mon Sep 17 00:00:00 2001 From: Milosz Muszynski Date: Thu, 30 Nov 2023 13:50:07 +0100 Subject: [PATCH 1/2] Remove code hasher --- Cargo.toml | 2 +- macros/code-hasher/Cargo.toml | 23 -- macros/code-hasher/LICENSE | 373 ----------------------- macros/code-hasher/Makefile | 16 - macros/code-hasher/README.md | 29 -- macros/code-hasher/src/lib.rs | 100 ------ macros/code-hasher/tests/main.rs | 75 ----- moat-core/Cargo.toml | 1 - moat-core/src/circuit/license_circuit.rs | 5 - 9 files changed, 1 insertion(+), 623 deletions(-) delete mode 100644 macros/code-hasher/Cargo.toml delete mode 100644 macros/code-hasher/LICENSE delete mode 100644 macros/code-hasher/Makefile delete mode 100644 macros/code-hasher/README.md delete mode 100644 macros/code-hasher/src/lib.rs delete mode 100644 macros/code-hasher/tests/main.rs diff --git a/Cargo.toml b/Cargo.toml index 3f31142..f068efd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["moat-cli/moat-cli-common", "moat-cli/moat-cli-user", "moat-cli/moat-cli-lp", "moat-cli/moat-cli-sp", "moat-core", "integration-tests", "macros/code-hasher", "moat-example"] +members = ["moat-cli/moat-cli-common", "moat-cli/moat-cli-user", "moat-cli/moat-cli-lp", "moat-cli/moat-cli-sp", "moat-core", "integration-tests", "moat-example"] diff --git a/macros/code-hasher/Cargo.toml b/macros/code-hasher/Cargo.toml deleted file mode 100644 index fb2ae54..0000000 --- a/macros/code-hasher/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "code-hasher" -version = "0.4.0" -edition = "2021" - -readme = "README.md" -repository = "https://github.com/dusk-network/rusk" -description = "Tiny macro which generates associated constants based on the associated item content" -license = "MPL-2.0" - -[lib] -proc-macro = true - -[dependencies] -blake3 = "1.3" -quote = "1.0" -proc-macro2 = "1.0" -syn = { version = "1.0", features = ["full"] } -darling = "0.14" -semver = "1.0" - -[dev-dependencies] -dusk-plonk = "0.16" diff --git a/macros/code-hasher/LICENSE b/macros/code-hasher/LICENSE deleted file mode 100644 index fa0086a..0000000 --- a/macros/code-hasher/LICENSE +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/macros/code-hasher/Makefile b/macros/code-hasher/Makefile deleted file mode 100644 index 83fafaf..0000000 --- a/macros/code-hasher/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -all: ## Build the code-hasher macro - @cargo build --release - -help: ## Display this help screen - @grep -h \ - -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \ - awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' - -test: ## Perform the test of the code-hasher macro - @cargo test \ - --release \ - -clippy: ## Run clippy - @cargo clippy --all-features --release -- -D warnings - -.PHONY: all test help diff --git a/macros/code-hasher/README.md b/macros/code-hasher/README.md deleted file mode 100644 index 33525c7..0000000 --- a/macros/code-hasher/README.md +++ /dev/null @@ -1,29 +0,0 @@ -![Build Status](https://github.com/dusk-network/rusk/workflows/Continuous%20integration/badge.svg) -[![Repository](https://img.shields.io/badge/github-code--hasher-blueviolet?logo=github)](https://github.com/dusk-network/code-hasher) -[![Documentation](https://img.shields.io/badge/docs-code--hasher-blue?logo=rust)](https://docs.rs/code-hasher/) -# code-hasher - -Tiny proc macro library designed to hash a code block generating a unique -identifier for it which will get written into a `const` inside of the code -block. - -## Example - -```rust -#[code_hasher::hash(SOME_CONST_NAME, version = "0.1.0")] -pub mod testing_module { - pub fn this_does_something() -> [u8; 32] { - SOME_CONST_NAME - } -} -``` - -Here, `SOME_CONST_NAME` has assigned as value the resulting hash of: -- The code contained inside `testing_module`. -- The version passed by the user (is optional). Not adding it will basically - not hash this attribute and **WILL NOT** use any default alternatives. - - -## Licensing -This code is licensed under Mozilla Public License Version 2.0 (MPL-2.0). -Please see [LICENSE](https://github.com/dusk-network/rusk/tree/master/macros/code-hasher/LICENSE) for further info. \ No newline at end of file diff --git a/macros/code-hasher/src/lib.rs b/macros/code-hasher/src/lib.rs deleted file mode 100644 index d297c49..0000000 --- a/macros/code-hasher/src/lib.rs +++ /dev/null @@ -1,100 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. -// -// Copyright (c) DUSK NETWORK. All rights reserved. - -//! ![Build Status](https://github.com/dusk-network/rusk/workflows/Continuous%20integration/badge.svg) -//! [![Repository](https://img.shields.io/badge/github-code--hasher-blueviolet?logo=github)](https://github.com/dusk-network/code-hasher) -//! [![Documentation](https://img.shields.io/badge/docs-code--hasher-blue?logo=rust)](https://docs.rs/code-hasher/) -//! # code-hasher -//! -//! Tiny proc macro library designed to hash an impl block and generate a unique -//! identifier for it which will get written into an associated `const` of the -//! same type the impl block targets. -//! -//! ## Example -//! ```rust -//! struct MyStruct; -//! -//! #[code_hasher::hash(name = "SOME_CONST_NAME", version = "0.1.0")] -//! impl MyStruct { -//! pub fn this_does_something() -> [u8; 32] { -//! Self::SOME_CONST_NAME -//! } -//! } -//! ``` -//! -//! Here, `SOME_CONST_NAME` has assigned as value the resulting hash of: -//! - The `impl MyStruct` code block. -//! - The version passed by the user. The only value that is mixed in the hash -//! is the major version number - if larger than 0 - or the minor version -//! number. -//! -//! ## Licensing -//! This code is licensed under Mozilla Public License Version 2.0 (MPL-2.0). -//! Please see [LICENSE](https://github.com/dusk-network/rusk/tree/master/macros/code-hasher/LICENSE) for further info. - -use blake3::Hasher; -use darling::FromMeta; -use proc_macro::TokenStream; -use quote::quote; -use semver::Version; -use syn::{parse_macro_input, AttributeArgs, ItemImpl}; - -#[derive(Debug, FromMeta)] -struct MacroArgs { - name: proc_macro2::Ident, - version: Option, -} - -#[proc_macro_attribute] -pub fn hash(args: TokenStream, input: TokenStream) -> TokenStream { - let input_string = input.to_string(); - - let args = parse_macro_input!(args as AttributeArgs); - let input = parse_macro_input!(input as ItemImpl); - - let args = match MacroArgs::from_list(&args) { - Ok(v) => v, - Err(e) => { - return TokenStream::from(e.write_errors()); - } - }; - - // If the version changed in a "major way" the hash should also change - let mut version = String::from("undefined"); - if let Some(v) = args.version { - let v = match Version::parse(&v) { - Ok(v) => v, - Err(e) => panic!("version should be valid semver: {e}"), - }; - - if v.major == 0 { - version = format!("0.{}.0", v.minor); - } else { - version = format!("{}.0.0", v.major); - } - } - - let mut hasher = Hasher::new(); - - hasher.update(input_string.as_bytes()); - hasher.update(version.as_bytes()); - - let hash: [u8; 32] = hasher.finalize().into(); - - let const_name = args.name; - let type_name = &input.self_ty; - let generics = &input.generics; - - let output = quote! { - impl #generics #type_name { - const #const_name: [u8; 32] = [#(#hash),*]; - } - - #input - }; - - output.into() -} diff --git a/macros/code-hasher/tests/main.rs b/macros/code-hasher/tests/main.rs deleted file mode 100644 index 6d397d2..0000000 --- a/macros/code-hasher/tests/main.rs +++ /dev/null @@ -1,75 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. -// -// Copyright (c) DUSK NETWORK. All rights reserved. - -use dusk_plonk::prelude::*; - -#[derive(Debug, Default)] -pub struct TestCircuit {} - -#[code_hasher::hash(name = "CIRCUIT_ID")] -impl Circuit for TestCircuit { - fn circuit(&self, _composer: &mut C) -> Result<(), Error> { - unimplemented!() - } -} - -#[derive(Debug, Default)] -pub struct AnotherTestCircuit {} - -#[code_hasher::hash(name = "CIRCUIT_ID")] -impl Circuit for AnotherTestCircuit { - fn circuit(&self, _composer: &mut C) -> Result<(), Error> { - unimplemented!() - } -} - -#[code_hasher::hash(name = "MAJOR_HASH_1", version = "1.0.1")] -impl TestCircuit {} - -#[code_hasher::hash(name = "MAJOR_HASH_2", version = "1.1.1")] -impl TestCircuit {} - -#[code_hasher::hash(name = "MAJOR_HASH_3", version = "2.1.1")] -impl TestCircuit {} - -#[code_hasher::hash(name = "MINOR_HASH_1", version = "0.1.0")] -impl TestCircuit {} - -#[code_hasher::hash(name = "MINOR_HASH_2", version = "0.1.1")] -impl TestCircuit {} - -#[code_hasher::hash(name = "MINOR_HASH_3", version = "0.0.0")] -impl TestCircuit {} - -mod tests { - use super::*; - - #[test] - fn plonk_testcase_works() { - assert_eq!( - &TestCircuit::CIRCUIT_ID, - &[ - 204, 39, 45, 48, 124, 51, 199, 86, 58, 196, 113, 171, 253, 88, - 69, 13, 175, 162, 92, 76, 240, 138, 151, 178, 212, 136, 233, - 126, 161, 146, 54, 214 - ] - ); - } - - #[test] - fn diff_struct_is_diff_hash() { - assert_ne!(&TestCircuit::CIRCUIT_ID, &AnotherTestCircuit::CIRCUIT_ID); - } - - #[test] - fn version_changes_as_expected() { - assert_eq!(&TestCircuit::MAJOR_HASH_1, &TestCircuit::MAJOR_HASH_2); - assert_ne!(&TestCircuit::MAJOR_HASH_1, &TestCircuit::MAJOR_HASH_3); - - assert_eq!(&TestCircuit::MINOR_HASH_1, &TestCircuit::MINOR_HASH_2); - assert_ne!(&TestCircuit::MINOR_HASH_1, &TestCircuit::MINOR_HASH_3); - } -} diff --git a/moat-core/Cargo.toml b/moat-core/Cargo.toml index 9ec078c..5cb7969 100644 --- a/moat-core/Cargo.toml +++ b/moat-core/Cargo.toml @@ -33,7 +33,6 @@ hex = "0.4" rand = "0.8" dusk-bytes = "0.1" blake3 = "1.4" -code-hasher = { path = "../macros/code-hasher", version = "0.4.0" } tracing = "0.1" bytes = "1.4" reqwest = "0.11" diff --git a/moat-core/src/circuit/license_circuit.rs b/moat-core/src/circuit/license_circuit.rs index c288a11..9680b71 100644 --- a/moat-core/src/circuit/license_circuit.rs +++ b/moat-core/src/circuit/license_circuit.rs @@ -25,13 +25,8 @@ impl LicenseCircuit { ) -> Self { Self { lpp: *lpp, sc: *sc } } - - pub const fn circuit_id() -> &'static [u8; 32] { - &Self::CIRCUIT_ID - } } -#[code_hasher::hash(name = "CIRCUIT_ID", version = "0.2.0")] impl Circuit for LicenseCircuit { fn circuit(&self, composer: &mut C) -> Result<(), Error> where From 01cda3bcc75ee1304300832b4d0352c9970ea2e5 Mon Sep 17 00:00:00 2001 From: Milosz Muszynski Date: Thu, 30 Nov 2023 14:08:44 +0100 Subject: [PATCH 2/2] Removed usage of stake contract in test --- .../{stake_add_owner.rs => contract_call.rs} | 16 ++++++++++------ integration-tests/tests/blockchain/mod.rs | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) rename integration-tests/tests/blockchain/{stake_add_owner.rs => contract_call.rs} (80%) diff --git a/integration-tests/tests/blockchain/stake_add_owner.rs b/integration-tests/tests/blockchain/contract_call.rs similarity index 80% rename from integration-tests/tests/blockchain/stake_add_owner.rs rename to integration-tests/tests/blockchain/contract_call.rs index 49bbe9e..2b93fcc 100644 --- a/integration-tests/tests/blockchain/stake_add_owner.rs +++ b/integration-tests/tests/blockchain/contract_call.rs @@ -18,16 +18,18 @@ const PWD_HASH: &str = const GAS_LIMIT: u64 = 5_000_000_000; const GAS_PRICE: u64 = 1; -pub const STAKE_CONTRACT_ID: ModuleId = { +pub const LICENSE_CONTRACT_ID: ModuleId = { let mut bytes = [0u8; 32]; - bytes[0] = 0x02; + bytes[0] = 0x03; bytes }; -pub const ADD_OWNER_METHOD_NAME: &str = "add_owner"; +// note that any method can be used here as long as it does not require +// arguments +pub const CONTRACT_METHOD_NAME: &str = "request_license"; #[tokio::test(flavor = "multi_thread")] #[cfg_attr(not(feature = "int_tests"), ignore)] -async fn stake_add_owner() -> Result<(), Error> { +async fn contract_call_with_payload() -> Result<(), Error> { let blockchain_config_path = concat!(env!("CARGO_MANIFEST_DIR"), "/config.toml"); @@ -46,14 +48,16 @@ async fn stake_add_owner() -> Result<(), Error> { ); let tx_id = PayloadSender::execute_contract_method( + // any payload will do as long as the called method does not require + // arguments request_json.provider_psk, &blockchain_config, &wallet_path, &PwdHash(PWD_HASH.to_string()), GAS_LIMIT, GAS_PRICE, - STAKE_CONTRACT_ID, - ADD_OWNER_METHOD_NAME, + LICENSE_CONTRACT_ID, + CONTRACT_METHOD_NAME, ) .await?; let client = RuskHttpClient::new(blockchain_config.rusk_address.clone()); diff --git a/integration-tests/tests/blockchain/mod.rs b/integration-tests/tests/blockchain/mod.rs index 9fc5224..4da0fbc 100644 --- a/integration-tests/tests/blockchain/mod.rs +++ b/integration-tests/tests/blockchain/mod.rs @@ -4,6 +4,6 @@ // // Copyright (c) DUSK NETWORK. All rights reserved. +mod contract_call; mod get_crs; mod retrieve_txs; -mod stake_add_owner;