Merge branch 'master' into ag-call-runtime-stabilize

integration-tests/custom-environment/Cargo.toml

@@ -26,3 +26,6 @@ std = [
 ]
 ink-as-dependency = []
 e2e-tests = []
+
+# Assumes that the node used in E2E testing allows for at least 6 event topics.
+permissive-node = []

integration-tests/custom-environment/lib.rs

@@ -94,6 +94,7 @@ mod runtime_call {
 
         type E2EResult<T> = Result<T, Box<dyn std::error::Error>>;
 
+        #[cfg(feature = "permissive-node")]
         #[ink_e2e::test(environment = crate::EnvironmentWithManyTopics)]
         async fn calling_custom_environment_works(
             mut client: Client<C, E>,
@@ -125,5 +126,37 @@ mod runtime_call {
 
             Ok(())
         }
+
+        #[cfg(not(feature = "permissive-node"))]
+        #[ink_e2e::test(environment = crate::EnvironmentWithManyTopics)]
+        async fn calling_custom_environment_fails_if_incompatible_with_node(
+            mut client: Client<C, E>,
+        ) -> E2EResult<()> {
+            // given
+            let constructor = TopicsRef::new();
+            let contract = client
+                .instantiate(
+                    "custom-environment",
+                    &ink_e2e::alice(),
+                    constructor,
+                    0,
+                    None,
+                )
+                .await
+                .expect("instantiate failed");
+            let mut call = contract.call::<Topics>();
+
+            let message = call.trigger();
+
+            // when
+            let call_res = client
+                .call_dry_run(&ink_e2e::alice(), &message, 0, None)
+                .await;
+
+            // then
+            assert!(call_res.is_err());
+
+            Ok(())
+        }
     }
 }