second try for fixing file path

sergiuosvat · Aug 21, 2024 · bb556e8 · bb556e8
1 parent ca2cad5
commit bb556e8
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 24 deletions.
diff --git a/contracts/potlock/scenarios/potlock-accept-application.scen.json b/contracts/potlock/scenarios/potlock-accept-application.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-accept-pot.scen.json b/contracts/potlock/scenarios/potlock-accept-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-add-pot.scen.json b/contracts/potlock/scenarios/potlock-add-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-apply-for-pot.scen.json b/contracts/potlock/scenarios/potlock-apply-for-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-deploy.scen.json b/contracts/potlock/scenarios/potlock-deploy.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-distribute-pot-to-projects.scen.json b/contracts/potlock/scenarios/potlock-distribute-pot-to-projects.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-distribute-to-project-less-than-max-percent.scen.json b/contracts/potlock/scenarios/potlock-distribute-to-project-less-than-max-percent.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-donate-to-pot-different-tokens.scen.json b/contracts/potlock/scenarios/potlock-donate-to-pot-different-tokens.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-donate-to-pot-same-token.scen.json b/contracts/potlock/scenarios/potlock-donate-to-pot-same-token.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-donate-to-pot.scen.json b/contracts/potlock/scenarios/potlock-donate-to-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-donate-to-project.scen.json b/contracts/potlock/scenarios/potlock-donate-to-project.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-accept-application.scen.json b/contracts/potlock/scenarios/potlock-fail-accept-application.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-accept-pot.scen.json b/contracts/potlock/scenarios/potlock-fail-accept-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-add-pot.scen.json b/contracts/potlock/scenarios/potlock-fail-add-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-distribute-pot-to-projects.scen.json b/contracts/potlock/scenarios/potlock-fail-distribute-pot-to-projects.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-distribute-pot-to-projects2.scen.json b/contracts/potlock/scenarios/potlock-fail-distribute-pot-to-projects2.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-donate-to-project.scen.json b/contracts/potlock/scenarios/potlock-fail-donate-to-project.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-fail-remove-pot.scen.json b/contracts/potlock/scenarios/potlock-fail-remove-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-multiple-change-fees.scen.json b/contracts/potlock/scenarios/potlock-multiple-change-fees.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/scenarios/potlock-remove-pot.scen.json b/contracts/potlock/scenarios/potlock-remove-pot.scen.json
@@ -49,7 +49,7 @@
             "id": "",
             "tx": {
                 "from": "address:owner",
-                "contractCode": "mxsc:output/potlock.mxsc.json",
+                "contractCode": "mxsc:../output/potlock.mxsc.json",
                 "arguments": [
                     "0x61646d696e5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"
                 ],

diff --git a/contracts/potlock/tests/potlock_blackbox_tests.rs b/contracts/potlock/tests/potlock_blackbox_tests.rs
@@ -3,7 +3,7 @@ use potlock::potlock_storage::{PotlockId, ProjectId};
 mod potlock_proxy;
 
 const POTLOCK_ADDRESS: TestSCAddress = TestSCAddress::new("potlock");
-const POTLOCK_CODE_PATH: MxscPath = MxscPath::new("output/potlock.mxsc.json");
+const POTLOCK_CODE_PATH: MxscPath = MxscPath::new("../output/potlock.mxsc.json");
 const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 const ADMIN_ADDRESS: TestAddress = TestAddress::new("admin");
 const POT_PROPOSER_ADDRESS: TestAddress = TestAddress::new("pot_proposer");

diff --git a/contracts/potlock/tests/potlock_scenario_go_test.rs b/contracts/potlock/tests/potlock_scenario_go_test.rs
@@ -44,6 +44,16 @@ fn potlock_donate_to_pot_go() {
     world().run("scenarios/potlock-donate-to-pot.scen.json");
 }
 
+#[test]
+fn potlock_donate_to_pot_different_tokens_go() {
+    world().run("scenarios/potlock-donate-to-pot-different-tokens.scen.json");
+}
+
+#[test]
+fn potlock_donate_to_pot_same_token_go() {
+    world().run("scenarios/potlock-donate-to-pot-same-token.scen.json");
+}
+
 #[test]
 fn potlock_donate_to_project_go() {
     world().run("scenarios/potlock-donate-to-project.scen.json");
@@ -84,6 +94,11 @@ fn potlock_fail_remove_pot_go() {
     world().run("scenarios/potlock-fail-remove-pot.scen.json");
 }
 
+#[test]
+fn potlock_multiple_change_fees_go() {
+    world().run("scenarios/potlock-multiple-change-fees.scen.json");
+}
+
 #[test]
 fn potlock_remove_pot_go() {
     world().run("scenarios/potlock-remove-pot.scen.json");

diff --git a/contracts/potlock/tests/potlock_scenario_rs_test.rs b/contracts/potlock/tests/potlock_scenario_rs_test.rs
@@ -1,7 +1,4 @@
 use multiversx_sc_scenario::*;
-use multiversx_sc_scenario::imports::MxscPath;
-
-const _: MxscPath = MxscPath::new("output/potlock.mxsc.json");
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -50,6 +47,16 @@ fn potlock_donate_to_pot_rs() {
     world().run("scenarios/potlock-donate-to-pot.scen.json");
 }
 
+#[test]
+fn potlock_donate_to_pot_different_tokens_rs() {
+    world().run("scenarios/potlock-donate-to-pot-different-tokens.scen.json");
+}
+
+#[test]
+fn potlock_donate_to_pot_same_token_rs() {
+    world().run("scenarios/potlock-donate-to-pot-same-token.scen.json");
+}
+
 #[test]
 fn potlock_donate_to_project_rs() {
     world().run("scenarios/potlock-donate-to-project.scen.json");
@@ -90,6 +97,11 @@ fn potlock_fail_remove_pot_rs() {
     world().run("scenarios/potlock-fail-remove-pot.scen.json");
 }
 
+#[test]
+fn potlock_multiple_change_fees_rs() {
+    world().run("scenarios/potlock-multiple-change-fees.scen.json");
+}
+
 #[test]
 fn potlock_remove_pot_rs() {
     world().run("scenarios/potlock-remove-pot.scen.json");