Skip to content

Commit

Permalink
Make CI check format of UI tests (use-ink#534)
Browse files Browse the repository at this point in the history
* [ci] Check format of UI tests as well

* [lang] Apply our formatting guidelines to UI tests

* [ci] Make Gitlab happy

* [ci] Remove superfluous space

* [ci] Output rustfmt version

* [ci] Tune rustfmt params

* Remove todo's

* Migrate erc721 ui test contract to recent example contract

* Remove --version command used to debug

* Apply cargo fmt

* .gitlab-ci.yml formatting

* Add main fn

* Remove todo from stderr expect

* Adapt fixtures

* Revert "Adapt fixtures"

This reverts commit 174c012.

* Adapt fixtures
  • Loading branch information
Michael Müller authored Nov 11, 2020
1 parent 402a694 commit fe82d17
Show file tree
Hide file tree
Showing 6 changed files with 617 additions and 189 deletions.
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ 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


#### stage: examples

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod message_invalid_selector {
}

#[ink(message, selector = "0x00")]
pub fn invalid_selector(&self) { }
pub fn invalid_selector(&self) {}
}
}

Expand Down
8 changes: 6 additions & 2 deletions crates/lang/macro/tests/ui/fail/S-04-non-storage-ink-impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ mod non_storage_ink_impls {
// This ink! impl block is okay.
impl StorageStruct {
#[ink(constructor)]
pub fn constructor1() -> Self { todo!() }
pub fn constructor1() -> Self {
Self {}
}

#[ink(message)]
pub fn message1(&self) {}
Expand All @@ -25,7 +27,9 @@ mod non_storage_ink_impls {
// storage struct. We expect a failure here.
impl NonStorageStruct {
#[ink(constructor)]
pub fn constructor2() -> Self { todo!() }
pub fn constructor2() -> Self {
Self {}
}

#[ink(message)]
pub fn message2(&self) {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
error[E0271]: type mismatch resolving `<NonStorageStruct as non_storage_ink_impls::_::_::{closure#0}::TypeEq>::This == StorageStruct`
--> $DIR/S-04-non-storage-ink-impls.rs:26:10
--> $DIR/S-04-non-storage-ink-impls.rs:28:10
|
26 | impl NonStorageStruct {
28 | impl NonStorageStruct {
| ^^^^^^^^^^^^^^^^
| |
| expected struct `StorageStruct`, found struct `NonStorageStruct`
Expand All @@ -11,24 +11,24 @@ error[E0271]: type mismatch resolving `<NonStorageStruct as non_storage_ink_impl
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0599]: no function or associated item named `constructor2` found for struct `StorageStruct` in the current scope
--> $DIR/S-04-non-storage-ink-impls.rs:28:16
--> $DIR/S-04-non-storage-ink-impls.rs:30:16
|
9 | pub struct StorageStruct {}
| ------------------------ function or associated item `constructor2` not found for this
...
28 | pub fn constructor2() -> Self { todo!() }
30 | pub fn constructor2() -> Self {
| ^^^^^^^^^^^^
| |
| function or associated item not found in `StorageStruct`
| help: there is an associated function with a similar name: `constructor1`

error[E0599]: no function or associated item named `message2` found for struct `StorageStruct` in the current scope
--> $DIR/S-04-non-storage-ink-impls.rs:31:16
--> $DIR/S-04-non-storage-ink-impls.rs:35:16
|
9 | pub struct StorageStruct {}
| ------------------------ function or associated item `message2` not found for this
...
31 | pub fn message2(&self) {}
35 | pub fn message2(&self) {}
| ^^^^^^^^
| |
| function or associated item not found in `StorageStruct`
Expand Down
4 changes: 1 addition & 3 deletions crates/lang/macro/tests/ui/pass/02-flipper-contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ mod flipper {
impl Flipper {
#[ink(constructor)]
pub fn new(init_value: bool) -> Self {
Self {
value: init_value,
}
Self { value: init_value }
}

#[ink(constructor)]
Expand Down
Loading

0 comments on commit fe82d17

Please sign in to comment.