Move ink_lang_macro UI tests into macro-specific folders (#934)

* move ink_lang_macro UI tests into macro-specific folders * fix GitLab CI formatting pass * migrate back to a single trybuild test case This is because our CI currently fails if we have multiple test cases.
use-ink · Sep 21, 2021 · 87867ef · 87867ef
1 parent 7577c67
commit 87867ef
Show file tree

Hide file tree

Showing 75 changed files with 43 additions and 43 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -287,7 +287,7 @@ fmt:
   script:
     - cargo fmt --verbose --all -- --check
     # For the UI tests we need to disable the license check
-    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/macro/tests/ui/{pass,fail}/*.rs
+    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/macro/tests/ui/contract/{pass,fail}/*.rs
 
 
 #### stage:                        examples

diff --git a/crates/lang/macro/tests/compile_tests.rs b/crates/lang/macro/tests/compile_tests.rs
@@ -16,53 +16,53 @@
 fn compile_tests() {
     let t = trybuild::TestCases::new();
 
-    t.pass("tests/ui/pass/01-noop-contract.rs");
-    t.pass("tests/ui/pass/02-flipper-contract.rs");
-    t.pass("tests/ui/pass/03-incrementer-contract.rs");
-    t.pass("tests/ui/pass/04-erc20-contract.rs");
-    t.pass("tests/ui/pass/05-erc721-contract.rs");
-    t.pass("tests/ui/pass/06-non-ink-items.rs");
-    t.pass("tests/ui/pass/07-flipper-as-dependency.rs");
-    t.pass("tests/ui/pass/08-flipper-as-dependency-trait.rs");
-    t.pass("tests/ui/pass/09-static-env.rs");
-    t.pass("tests/ui/pass/10-derive-for-storage.rs");
-    t.pass("tests/ui/pass/11-alias-storage-struct-impl.rs");
+    t.pass("tests/ui/contract/pass/01-noop-contract.rs");
+    t.pass("tests/ui/contract/pass/02-flipper-contract.rs");
+    t.pass("tests/ui/contract/pass/03-incrementer-contract.rs");
+    t.pass("tests/ui/contract/pass/04-erc20-contract.rs");
+    t.pass("tests/ui/contract/pass/05-erc721-contract.rs");
+    t.pass("tests/ui/contract/pass/06-non-ink-items.rs");
+    t.pass("tests/ui/contract/pass/07-flipper-as-dependency.rs");
+    t.pass("tests/ui/contract/pass/08-flipper-as-dependency-trait.rs");
+    t.pass("tests/ui/contract/pass/09-static-env.rs");
+    t.pass("tests/ui/contract/pass/10-derive-for-storage.rs");
+    t.pass("tests/ui/contract/pass/11-alias-storage-struct-impl.rs");
 
-    t.compile_fail("tests/ui/fail/C-00-constructor-self-ref.rs");
-    t.compile_fail("tests/ui/fail/C-01-constructor-self-mut.rs");
-    t.compile_fail("tests/ui/fail/C-02-constructor-self-val.rs");
-    t.compile_fail("tests/ui/fail/C-03-constructor-missing-return.rs");
-    t.compile_fail("tests/ui/fail/C-04-missing-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-10-async-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-11-unsafe-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-12-const-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-13-abi-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-14-payable-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-15-payable-trait-constructor.rs");
-    t.compile_fail("tests/ui/fail/C-16-function-arg-struct-destructuring.rs");
+    t.compile_fail("tests/ui/contract/fail/C-00-constructor-self-ref.rs");
+    t.compile_fail("tests/ui/contract/fail/C-01-constructor-self-mut.rs");
+    t.compile_fail("tests/ui/contract/fail/C-02-constructor-self-val.rs");
+    t.compile_fail("tests/ui/contract/fail/C-03-constructor-missing-return.rs");
+    t.compile_fail("tests/ui/contract/fail/C-04-missing-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-10-async-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-11-unsafe-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-12-const-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-13-abi-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-14-payable-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-15-payable-trait-constructor.rs");
+    t.compile_fail("tests/ui/contract/fail/C-16-function-arg-struct-destructuring.rs");
 
-    t.compile_fail("tests/ui/fail/H-01-invalid-dyn-alloc.rs");
-    t.compile_fail("tests/ui/fail/H-02-invalid-as-dependency.rs");
-    t.compile_fail("tests/ui/fail/H-03-use-forbidden-idents.rs");
+    t.compile_fail("tests/ui/contract/fail/H-01-invalid-dyn-alloc.rs");
+    t.compile_fail("tests/ui/contract/fail/H-02-invalid-as-dependency.rs");
+    t.compile_fail("tests/ui/contract/fail/H-03-use-forbidden-idents.rs");
 
-    t.compile_fail("tests/ui/fail/M-01-missing-message.rs");
-    t.compile_fail("tests/ui/fail/M-02-message-missing-self-arg.rs");
-    t.compile_fail("tests/ui/fail/M-03-message-returns-self.rs");
-    t.compile_fail("tests/ui/fail/M-04-message-returns-non-codec.rs");
-    t.compile_fail("tests/ui/fail/M-05-message-invalid-selector.rs");
-    t.compile_fail("tests/ui/fail/M-06-message-invalid-selector-type.rs");
-    t.compile_fail("tests/ui/fail/M-10-method-unknown-ink-marker.rs");
+    t.compile_fail("tests/ui/contract/fail/M-01-missing-message.rs");
+    t.compile_fail("tests/ui/contract/fail/M-02-message-missing-self-arg.rs");
+    t.compile_fail("tests/ui/contract/fail/M-03-message-returns-self.rs");
+    t.compile_fail("tests/ui/contract/fail/M-04-message-returns-non-codec.rs");
+    t.compile_fail("tests/ui/contract/fail/M-05-message-invalid-selector.rs");
+    t.compile_fail("tests/ui/contract/fail/M-06-message-invalid-selector-type.rs");
+    t.compile_fail("tests/ui/contract/fail/M-10-method-unknown-ink-marker.rs");
 
-    t.compile_fail("tests/ui/fail/S-01-missing-storage-struct.rs");
-    t.compile_fail("tests/ui/fail/S-02-multiple-storage-structs.rs");
-    t.compile_fail("tests/ui/fail/S-03-struct-unknown-ink-marker.rs");
-    t.compile_fail("tests/ui/fail/S-04-non-storage-ink-impls.rs");
-    t.compile_fail("tests/ui/fail/S-05-storage-as-event.rs");
-    t.compile_fail("tests/ui/fail/S-06-event-as-storage.rs");
+    t.compile_fail("tests/ui/contract/fail/S-01-missing-storage-struct.rs");
+    t.compile_fail("tests/ui/contract/fail/S-02-multiple-storage-structs.rs");
+    t.compile_fail("tests/ui/contract/fail/S-03-struct-unknown-ink-marker.rs");
+    t.compile_fail("tests/ui/contract/fail/S-04-non-storage-ink-impls.rs");
+    t.compile_fail("tests/ui/contract/fail/S-05-storage-as-event.rs");
+    t.compile_fail("tests/ui/contract/fail/S-06-event-as-storage.rs");
 
-    t.compile_fail("tests/ui/fail/N-01-namespace-invalid-identifier.rs");
-    t.compile_fail("tests/ui/fail/N-02-namespace-invalid-type.rs");
-    t.compile_fail("tests/ui/fail/N-03-namespace-missing-argument.rs");
+    t.compile_fail("tests/ui/contract/fail/N-01-namespace-invalid-identifier.rs");
+    t.compile_fail("tests/ui/contract/fail/N-02-namespace-invalid-type.rs");
+    t.compile_fail("tests/ui/contract/fail/N-03-namespace-missing-argument.rs");
 
     t.pass("tests/ui/chain_extension/E-01-simple.rs");
 }
diff --git a/...ests/ui/fail/C-00-constructor-self-ref.rs → ...ontract/fail/C-00-constructor-self-ref.rs b/...ests/ui/fail/C-00-constructor-self-ref.rs → ...ontract/fail/C-00-constructor-self-ref.rs
diff --git a/.../ui/fail/C-00-constructor-self-ref.stderr → ...act/fail/C-00-constructor-self-ref.stderr b/.../ui/fail/C-00-constructor-self-ref.stderr → ...act/fail/C-00-constructor-self-ref.stderr
diff --git a/...ests/ui/fail/C-01-constructor-self-mut.rs → ...ontract/fail/C-01-constructor-self-mut.rs b/...ests/ui/fail/C-01-constructor-self-mut.rs → ...ontract/fail/C-01-constructor-self-mut.rs
diff --git a/.../ui/fail/C-01-constructor-self-mut.stderr → ...act/fail/C-01-constructor-self-mut.stderr b/.../ui/fail/C-01-constructor-self-mut.stderr → ...act/fail/C-01-constructor-self-mut.stderr
diff --git a/...ests/ui/fail/C-02-constructor-self-val.rs → ...ontract/fail/C-02-constructor-self-val.rs b/...ests/ui/fail/C-02-constructor-self-val.rs → ...ontract/fail/C-02-constructor-self-val.rs
diff --git a/.../ui/fail/C-02-constructor-self-val.stderr → ...act/fail/C-02-constructor-self-val.stderr b/.../ui/fail/C-02-constructor-self-val.stderr → ...act/fail/C-02-constructor-self-val.stderr
diff --git a/...i/fail/C-03-constructor-missing-return.rs → ...t/fail/C-03-constructor-missing-return.rs b/...i/fail/C-03-constructor-missing-return.rs → ...t/fail/C-03-constructor-missing-return.rs
diff --git a/...il/C-03-constructor-missing-return.stderr → ...il/C-03-constructor-missing-return.stderr b/...il/C-03-constructor-missing-return.stderr → ...il/C-03-constructor-missing-return.stderr
diff --git a/...tests/ui/fail/C-04-missing-constructor.rs → ...contract/fail/C-04-missing-constructor.rs b/...tests/ui/fail/C-04-missing-constructor.rs → ...contract/fail/C-04-missing-constructor.rs
diff --git a/...s/ui/fail/C-04-missing-constructor.stderr → ...ract/fail/C-04-missing-constructor.stderr b/...s/ui/fail/C-04-missing-constructor.stderr → ...ract/fail/C-04-missing-constructor.stderr
diff --git a/...o/tests/ui/fail/C-10-async-constructor.rs → ...i/contract/fail/C-10-async-constructor.rs b/...o/tests/ui/fail/C-10-async-constructor.rs → ...i/contract/fail/C-10-async-constructor.rs
diff --git a/...sts/ui/fail/C-10-async-constructor.stderr → ...ntract/fail/C-10-async-constructor.stderr b/...sts/ui/fail/C-10-async-constructor.stderr → ...ntract/fail/C-10-async-constructor.stderr
diff --git a/.../tests/ui/fail/C-11-unsafe-constructor.rs → .../contract/fail/C-11-unsafe-constructor.rs b/.../tests/ui/fail/C-11-unsafe-constructor.rs → .../contract/fail/C-11-unsafe-constructor.rs
diff --git a/...ts/ui/fail/C-11-unsafe-constructor.stderr → ...tract/fail/C-11-unsafe-constructor.stderr b/...ts/ui/fail/C-11-unsafe-constructor.stderr → ...tract/fail/C-11-unsafe-constructor.stderr
diff --git a/...o/tests/ui/fail/C-12-const-constructor.rs → ...i/contract/fail/C-12-const-constructor.rs b/...o/tests/ui/fail/C-12-const-constructor.rs → ...i/contract/fail/C-12-const-constructor.rs
diff --git a/...sts/ui/fail/C-12-const-constructor.stderr → ...ntract/fail/C-12-const-constructor.stderr b/...sts/ui/fail/C-12-const-constructor.stderr → ...ntract/fail/C-12-const-constructor.stderr
diff --git a/...cro/tests/ui/fail/C-13-abi-constructor.rs → .../ui/contract/fail/C-13-abi-constructor.rs b/...cro/tests/ui/fail/C-13-abi-constructor.rs → .../ui/contract/fail/C-13-abi-constructor.rs
diff --git a/...tests/ui/fail/C-13-abi-constructor.stderr → ...contract/fail/C-13-abi-constructor.stderr b/...tests/ui/fail/C-13-abi-constructor.stderr → ...contract/fail/C-13-abi-constructor.stderr
diff --git a/...tests/ui/fail/C-14-payable-constructor.rs → ...contract/fail/C-14-payable-constructor.rs b/...tests/ui/fail/C-14-payable-constructor.rs → ...contract/fail/C-14-payable-constructor.rs
diff --git a/...s/ui/fail/C-14-payable-constructor.stderr → ...ract/fail/C-14-payable-constructor.stderr b/...s/ui/fail/C-14-payable-constructor.stderr → ...ract/fail/C-14-payable-constructor.stderr
diff --git a/...ui/fail/C-15-payable-trait-constructor.rs → ...ct/fail/C-15-payable-trait-constructor.rs b/...ui/fail/C-15-payable-trait-constructor.rs → ...ct/fail/C-15-payable-trait-constructor.rs
diff --git a/...ail/C-15-payable-trait-constructor.stderr → ...ail/C-15-payable-trait-constructor.stderr b/...ail/C-15-payable-trait-constructor.stderr → ...ail/C-15-payable-trait-constructor.stderr
diff --git a/...C-16-function-arg-struct-destructuring.rs → ...C-16-function-arg-struct-destructuring.rs b/...C-16-function-arg-struct-destructuring.rs → ...C-16-function-arg-struct-destructuring.rs
diff --git a/...-function-arg-struct-destructuring.stderr → ...-function-arg-struct-destructuring.stderr b/...-function-arg-struct-destructuring.stderr → ...-function-arg-struct-destructuring.stderr
diff --git a/...o/tests/ui/fail/H-01-invalid-dyn-alloc.rs → ...i/contract/fail/H-01-invalid-dyn-alloc.rs b/...o/tests/ui/fail/H-01-invalid-dyn-alloc.rs → ...i/contract/fail/H-01-invalid-dyn-alloc.rs
diff --git a/...sts/ui/fail/H-01-invalid-dyn-alloc.stderr → ...ntract/fail/H-01-invalid-dyn-alloc.stderr b/...sts/ui/fail/H-01-invalid-dyn-alloc.stderr → ...ntract/fail/H-01-invalid-dyn-alloc.stderr
diff --git a/...sts/ui/fail/H-02-invalid-as-dependency.rs → ...ntract/fail/H-02-invalid-as-dependency.rs b/...sts/ui/fail/H-02-invalid-as-dependency.rs → ...ntract/fail/H-02-invalid-as-dependency.rs
diff --git a/...ui/fail/H-02-invalid-as-dependency.stderr → ...ct/fail/H-02-invalid-as-dependency.stderr b/...ui/fail/H-02-invalid-as-dependency.stderr → ...ct/fail/H-02-invalid-as-dependency.stderr
diff --git a/...ests/ui/fail/H-03-use-forbidden-idents.rs → ...ontract/fail/H-03-use-forbidden-idents.rs b/...ests/ui/fail/H-03-use-forbidden-idents.rs → ...ontract/fail/H-03-use-forbidden-idents.rs
diff --git a/.../ui/fail/H-03-use-forbidden-idents.stderr → ...act/fail/H-03-use-forbidden-idents.stderr b/.../ui/fail/H-03-use-forbidden-idents.stderr → ...act/fail/H-03-use-forbidden-idents.stderr
diff --git a/...cro/tests/ui/fail/M-01-missing-message.rs → .../ui/contract/fail/M-01-missing-message.rs b/...cro/tests/ui/fail/M-01-missing-message.rs → .../ui/contract/fail/M-01-missing-message.rs
diff --git a/...tests/ui/fail/M-01-missing-message.stderr → ...contract/fail/M-01-missing-message.stderr b/...tests/ui/fail/M-01-missing-message.stderr → ...contract/fail/M-01-missing-message.stderr
diff --git a/.../ui/fail/M-02-message-missing-self-arg.rs → ...act/fail/M-02-message-missing-self-arg.rs b/.../ui/fail/M-02-message-missing-self-arg.rs → ...act/fail/M-02-message-missing-self-arg.rs
diff --git a/...fail/M-02-message-missing-self-arg.stderr → ...fail/M-02-message-missing-self-arg.stderr b/...fail/M-02-message-missing-self-arg.stderr → ...fail/M-02-message-missing-self-arg.stderr
diff --git a/...ests/ui/fail/M-03-message-returns-self.rs → ...ontract/fail/M-03-message-returns-self.rs b/...ests/ui/fail/M-03-message-returns-self.rs → ...ontract/fail/M-03-message-returns-self.rs
diff --git a/.../ui/fail/M-03-message-returns-self.stderr → ...act/fail/M-03-message-returns-self.stderr b/.../ui/fail/M-03-message-returns-self.stderr → ...act/fail/M-03-message-returns-self.stderr
diff --git a/...ui/fail/M-04-message-returns-non-codec.rs → ...ct/fail/M-04-message-returns-non-codec.rs b/...ui/fail/M-04-message-returns-non-codec.rs → ...ct/fail/M-04-message-returns-non-codec.rs
diff --git a/...ail/M-04-message-returns-non-codec.stderr → ...ail/M-04-message-returns-non-codec.stderr b/...ail/M-04-message-returns-non-codec.stderr → ...ail/M-04-message-returns-non-codec.stderr
diff --git a/.../ui/fail/M-05-message-invalid-selector.rs → ...act/fail/M-05-message-invalid-selector.rs b/.../ui/fail/M-05-message-invalid-selector.rs → ...act/fail/M-05-message-invalid-selector.rs
diff --git a/...fail/M-05-message-invalid-selector.stderr → ...fail/M-05-message-invalid-selector.stderr b/...fail/M-05-message-invalid-selector.stderr → ...fail/M-05-message-invalid-selector.stderr
diff --git a/...ail/M-06-message-invalid-selector-type.rs → ...ail/M-06-message-invalid-selector-type.rs b/...ail/M-06-message-invalid-selector-type.rs → ...ail/M-06-message-invalid-selector-type.rs
diff --git a/...M-06-message-invalid-selector-type.stderr → ...M-06-message-invalid-selector-type.stderr b/...M-06-message-invalid-selector-type.stderr → ...M-06-message-invalid-selector-type.stderr
diff --git a/...ui/fail/M-10-method-unknown-ink-marker.rs → ...ct/fail/M-10-method-unknown-ink-marker.rs b/...ui/fail/M-10-method-unknown-ink-marker.rs → ...ct/fail/M-10-method-unknown-ink-marker.rs
diff --git a/...ail/M-10-method-unknown-ink-marker.stderr → ...ail/M-10-method-unknown-ink-marker.stderr b/...ail/M-10-method-unknown-ink-marker.stderr → ...ail/M-10-method-unknown-ink-marker.stderr
diff --git a/...fail/N-01-namespace-invalid-identifier.rs → ...fail/N-01-namespace-invalid-identifier.rs b/...fail/N-01-namespace-invalid-identifier.rs → ...fail/N-01-namespace-invalid-identifier.rs
diff --git a/.../N-01-namespace-invalid-identifier.stderr → .../N-01-namespace-invalid-identifier.stderr b/.../N-01-namespace-invalid-identifier.stderr → .../N-01-namespace-invalid-identifier.stderr
diff --git a/...ts/ui/fail/N-02-namespace-invalid-type.rs → ...tract/fail/N-02-namespace-invalid-type.rs b/...ts/ui/fail/N-02-namespace-invalid-type.rs → ...tract/fail/N-02-namespace-invalid-type.rs
diff --git a/...i/fail/N-02-namespace-invalid-type.stderr → ...t/fail/N-02-namespace-invalid-type.stderr b/...i/fail/N-02-namespace-invalid-type.stderr → ...t/fail/N-02-namespace-invalid-type.stderr
diff --git a/...i/fail/N-03-namespace-missing-argument.rs → ...t/fail/N-03-namespace-missing-argument.rs b/...i/fail/N-03-namespace-missing-argument.rs → ...t/fail/N-03-namespace-missing-argument.rs
diff --git a/...il/N-03-namespace-missing-argument.stderr → ...il/N-03-namespace-missing-argument.stderr b/...il/N-03-namespace-missing-argument.stderr → ...il/N-03-namespace-missing-argument.stderr
diff --git a/...ts/ui/fail/S-01-missing-storage-struct.rs → ...tract/fail/S-01-missing-storage-struct.rs b/...ts/ui/fail/S-01-missing-storage-struct.rs → ...tract/fail/S-01-missing-storage-struct.rs
diff --git a/...i/fail/S-01-missing-storage-struct.stderr → ...t/fail/S-01-missing-storage-struct.stderr b/...i/fail/S-01-missing-storage-struct.stderr → ...t/fail/S-01-missing-storage-struct.stderr
diff --git a/.../ui/fail/S-02-multiple-storage-structs.rs → ...act/fail/S-02-multiple-storage-structs.rs b/.../ui/fail/S-02-multiple-storage-structs.rs → ...act/fail/S-02-multiple-storage-structs.rs
diff --git a/...fail/S-02-multiple-storage-structs.stderr → ...fail/S-02-multiple-storage-structs.stderr b/...fail/S-02-multiple-storage-structs.stderr → ...fail/S-02-multiple-storage-structs.stderr
diff --git a/...ui/fail/S-03-struct-unknown-ink-marker.rs → ...ct/fail/S-03-struct-unknown-ink-marker.rs b/...ui/fail/S-03-struct-unknown-ink-marker.rs → ...ct/fail/S-03-struct-unknown-ink-marker.rs
diff --git a/...ail/S-03-struct-unknown-ink-marker.stderr → ...ail/S-03-struct-unknown-ink-marker.stderr b/...ail/S-03-struct-unknown-ink-marker.stderr → ...ail/S-03-struct-unknown-ink-marker.stderr
diff --git a/...sts/ui/fail/S-04-non-storage-ink-impls.rs → ...ntract/fail/S-04-non-storage-ink-impls.rs b/...sts/ui/fail/S-04-non-storage-ink-impls.rs → ...ntract/fail/S-04-non-storage-ink-impls.rs
diff --git a/...ui/fail/S-04-non-storage-ink-impls.stderr → ...ct/fail/S-04-non-storage-ink-impls.stderr b/...ui/fail/S-04-non-storage-ink-impls.stderr → ...ct/fail/S-04-non-storage-ink-impls.stderr
diff --git a/...ro/tests/ui/fail/S-05-storage-as-event.rs → ...ui/contract/fail/S-05-storage-as-event.rs b/...ro/tests/ui/fail/S-05-storage-as-event.rs → ...ui/contract/fail/S-05-storage-as-event.rs
diff --git a/...ests/ui/fail/S-05-storage-as-event.stderr → ...ontract/fail/S-05-storage-as-event.stderr b/...ests/ui/fail/S-05-storage-as-event.stderr → ...ontract/fail/S-05-storage-as-event.stderr
diff --git a/...ro/tests/ui/fail/S-06-event-as-storage.rs → ...ui/contract/fail/S-06-event-as-storage.rs b/...ro/tests/ui/fail/S-06-event-as-storage.rs → ...ui/contract/fail/S-06-event-as-storage.rs
diff --git a/...ests/ui/fail/S-06-event-as-storage.stderr → ...ontract/fail/S-06-event-as-storage.stderr b/...ests/ui/fail/S-06-event-as-storage.stderr → ...ontract/fail/S-06-event-as-storage.stderr
diff --git a/...g/macro/tests/ui/pass/01-noop-contract.rs → ...ests/ui/contract/pass/01-noop-contract.rs b/...g/macro/tests/ui/pass/01-noop-contract.rs → ...ests/ui/contract/pass/01-noop-contract.rs
diff --git a/...acro/tests/ui/pass/02-flipper-contract.rs → ...s/ui/contract/pass/02-flipper-contract.rs b/...acro/tests/ui/pass/02-flipper-contract.rs → ...s/ui/contract/pass/02-flipper-contract.rs
diff --git a/.../tests/ui/pass/03-incrementer-contract.rs → .../contract/pass/03-incrementer-contract.rs b/.../tests/ui/pass/03-incrementer-contract.rs → .../contract/pass/03-incrementer-contract.rs
diff --git a/.../macro/tests/ui/pass/04-erc20-contract.rs → ...sts/ui/contract/pass/04-erc20-contract.rs b/.../macro/tests/ui/pass/04-erc20-contract.rs → ...sts/ui/contract/pass/04-erc20-contract.rs
diff --git a/...macro/tests/ui/pass/05-erc721-contract.rs → ...ts/ui/contract/pass/05-erc721-contract.rs b/...macro/tests/ui/pass/05-erc721-contract.rs → ...ts/ui/contract/pass/05-erc721-contract.rs
diff --git a/...g/macro/tests/ui/pass/06-non-ink-items.rs → ...ests/ui/contract/pass/06-non-ink-items.rs b/...g/macro/tests/ui/pass/06-non-ink-items.rs → ...ests/ui/contract/pass/06-non-ink-items.rs
diff --git a/...tests/ui/pass/07-flipper-as-dependency.rs → ...contract/pass/07-flipper-as-dependency.rs b/...tests/ui/pass/07-flipper-as-dependency.rs → ...contract/pass/07-flipper-as-dependency.rs
diff --git a/...ui/pass/08-flipper-as-dependency-trait.rs → ...ct/pass/08-flipper-as-dependency-trait.rs b/...ui/pass/08-flipper-as-dependency-trait.rs → ...ct/pass/08-flipper-as-dependency-trait.rs
diff --git a/...lang/macro/tests/ui/pass/09-static-env.rs → ...o/tests/ui/contract/pass/09-static-env.rs b/...lang/macro/tests/ui/pass/09-static-env.rs → ...o/tests/ui/contract/pass/09-static-env.rs
diff --git a/...ro/tests/ui/pass/10-derive-for-storage.rs → ...ui/contract/pass/10-derive-for-storage.rs b/...ro/tests/ui/pass/10-derive-for-storage.rs → ...ui/contract/pass/10-derive-for-storage.rs
diff --git a/...s/ui/pass/11-alias-storage-struct-impl.rs → ...ract/pass/11-alias-storage-struct-impl.rs b/...s/ui/pass/11-alias-storage-struct-impl.rs → ...ract/pass/11-alias-storage-struct-impl.rs