From 38ac53434c2486d7f6d2ae40c5cb1e8bfa323ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 9 Nov 2019 10:34:18 +0100
Subject: [PATCH] Fix the ui tests (#4066)
---
.../ui/empty_impl_runtime_apis_call.stderr | 2 +-
.../ui/impl_incorrect_method_signature.stderr | 17 +++++++++++++++--
.../tests/ui/invalid_api_version.stderr | 8 ++++++--
.../tests/ui/invalid_api_version_2.stderr | 8 ++++++--
.../tests/ui/invalid_api_version_3.stderr | 8 ++++++--
...e_reference_in_impl_runtime_apis_call.stderr | 17 +++++++++++++++--
6 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr b/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr
index 61527a34803..c714df5034c 100644
--- a/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr
@@ -2,4 +2,4 @@ error: No api implementation given!
--> $DIR/empty_impl_runtime_apis_call.rs:18:1
|
18 | impl_runtime_apis! {}
- | ^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
diff --git a/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr b/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr
index 025ca60c480..81bbec8645f 100644
--- a/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr
@@ -21,7 +21,17 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
| |_- type in trait
17 |
18 | impl_runtime_apis! {
- | ^^^^^^^^^^^^^^^^^^ expected u64, found struct `std::string::String`
+ | -^^^^^^^^^^^^^^^^^
+ | |
+ | _expected u64, found struct `std::string::String`
+ | |
+19 | | impl self::Api<Block> for Runtime {
+20 | | fn test(data: String) {}
+21 | | }
+... |
+33 | | }
+34 | | }
+ | |_- in this macro invocation
|
= note: expected type `fn(&RuntimeApiImpl<RuntimeApiImplCall>, &sr_primitives::generic::block::BlockId<sr_primitives::generic::block::Block<sr_primitives::generic::header::Header<u64, sr_primitives::traits::BlakeTwo256>, substrate_test_runtime::Extrinsic>>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<u8>) -> std::result::Result<sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::NativeOrEncoded<()>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::error::Error>`
found type `fn(&RuntimeApiImpl<RuntimeApiImplCall>, &sr_primitives::generic::block::BlockId<sr_primitives::generic::block::Block<sr_primitives::generic::header::Header<u64, sr_primitives::traits::BlakeTwo256>, substrate_test_runtime::Extrinsic>>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::ExecutionContext, std::option::Option<std::string::String>, std::vec::Vec<u8>) -> std::result::Result<sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::NativeOrEncoded<()>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::error::Error>`
@@ -36,7 +46,10 @@ error[E0308]: mismatched types
... |
33 | | }
34 | | }
- | |_^ expected u64, found struct `std::string::String`
+ | | ^
+ | | |
+ | |_expected u64, found struct `std::string::String`
+ | in this macro invocation
|
= note: expected type `u64`
found type `std::string::String`
diff --git a/substrate/core/sr-api-macros/tests/ui/invalid_api_version.stderr b/substrate/core/sr-api-macros/tests/ui/invalid_api_version.stderr
index e7d6aa0ed13..dcdbded81fe 100644
--- a/substrate/core/sr-api-macros/tests/ui/invalid_api_version.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/invalid_api_version.stderr
@@ -7,7 +7,9 @@ error: can't qualify macro invocation with `pub`
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
|
= help: try adjusting the macro to put `pub` inside the invocation
@@ -20,7 +22,9 @@ error: Unexpected `api_version` attribute. The supported format is `api_version(
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
--> $DIR/invalid_api_version.rs:4:4
diff --git a/substrate/core/sr-api-macros/tests/ui/invalid_api_version_2.stderr b/substrate/core/sr-api-macros/tests/ui/invalid_api_version_2.stderr
index 3e46efb2580..39b73938dfa 100644
--- a/substrate/core/sr-api-macros/tests/ui/invalid_api_version_2.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/invalid_api_version_2.stderr
@@ -7,7 +7,9 @@ error: can't qualify macro invocation with `pub`
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
|
= help: try adjusting the macro to put `pub` inside the invocation
@@ -20,7 +22,9 @@ error: Unexpected `api_version` attribute. The supported format is `api_version(
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
--> $DIR/invalid_api_version_2.rs:4:4
diff --git a/substrate/core/sr-api-macros/tests/ui/invalid_api_version_3.stderr b/substrate/core/sr-api-macros/tests/ui/invalid_api_version_3.stderr
index 661221f28e8..d1694458f80 100644
--- a/substrate/core/sr-api-macros/tests/ui/invalid_api_version_3.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/invalid_api_version_3.stderr
@@ -7,7 +7,9 @@ error: can't qualify macro invocation with `pub`
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
|
= help: try adjusting the macro to put `pub` inside the invocation
@@ -20,7 +22,9 @@ error: Unexpected `api_version` attribute. The supported format is `api_version(
6 | | fn test(data: u64);
7 | | }
8 | | }
- | |_^
+ | | ^ in this macro invocation
+ | |_|
+ |
error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
--> $DIR/invalid_api_version_3.rs:4:4
diff --git a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index b2b024ee7fe..345389b275f 100644
--- a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -21,7 +21,17 @@ error[E0053]: method `Api_test_runtime_api_impl` has an incompatible type for tr
| |_- type in trait
17 |
18 | impl_runtime_apis! {
- | ^^^^^^^^^^^^^^^^^^ expected u64, found &u64
+ | -^^^^^^^^^^^^^^^^^
+ | |
+ | _expected u64, found &u64
+ | |
+19 | | impl self::Api<Block> for Runtime {
+20 | | fn test(data: &u64) {
+21 | | unimplemented!()
+... |
+35 | | }
+36 | | }
+ | |_- in this macro invocation
|
= note: expected type `fn(&RuntimeApiImpl<RuntimeApiImplCall>, &sr_primitives::generic::block::BlockId<sr_primitives::generic::block::Block<sr_primitives::generic::header::Header<u64, sr_primitives::traits::BlakeTwo256>, substrate_test_runtime::Extrinsic>>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::ExecutionContext, std::option::Option<u64>, std::vec::Vec<u8>) -> std::result::Result<sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::NativeOrEncoded<()>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::error::Error>`
found type `fn(&RuntimeApiImpl<RuntimeApiImplCall>, &sr_primitives::generic::block::BlockId<sr_primitives::generic::block::Block<sr_primitives::generic::header::Header<u64, sr_primitives::traits::BlakeTwo256>, substrate_test_runtime::Extrinsic>>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::ExecutionContext, std::option::Option<&u64>, std::vec::Vec<u8>) -> std::result::Result<sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::runtime_api::NativeOrEncoded<()>, sr_api_hidden_includes_DECL_RUNTIME_APIS::sr_api_client::error::Error>`
@@ -36,7 +46,10 @@ error[E0308]: mismatched types
... |
35 | | }
36 | | }
- | |_^ expected u64, found &u64
+ | | ^
+ | | |
+ | |_expected u64, found &u64
+ | in this macro invocation
|
= note: expected type `u64`
found type `&u64`
--
GitLab