Minor code and text improvements

RELEASES.md

@@ -10,7 +10,7 @@ This is the 7th release candidate for ink! 3.0.
 - Added basic support for wildcard selectors ‒ [#1020](https://github.com/paritytech/ink/pull/1020).
   - This enables writing upgradable smart contracts using the proxy pattern.
     We added a new example illustrating this ‒ the [proxy](https://github.com/paritytech/ink/tree/master/examples/delegator) example.
-  - The wildcard selector is not yet supported to be annotated in a trait.
+  - Annotating a wildcard selector in traits is not yet supported.
 
 ## Changed
 - Upgraded to the unstable `seal_call` API ‒ [#960](https://github.com/paritytech/ink/pull/960).

crates/lang/codegen/src/generator/dispatch.rs

@@ -649,13 +649,12 @@ impl Dispatch<'_> {
                 }
             )
         });
-        let wildcard_index = self.query_wildcard_message();
-        let possibly_wildcard_selector_message = match wildcard_index {
-            Some(index) => {
-                let message_span = message_spans[index];
-                let message_ident = message_variant_ident(index);
+        let possibly_wildcard_selector_message = match self.query_wildcard_message() {
+            Some(wildcard_index) => {
+                let message_span = message_spans[wildcard_index];
+                let message_ident = message_variant_ident(wildcard_index);
                 let message_input =
-                    expand_message_input(message_span, storage_ident, index);
+                    expand_message_input(message_span, storage_ident, wildcard_index);
                 quote! {
                     ::core::result::Result::Ok(Self::#message_ident(
                         <#message_input as ::scale::Decode>::decode(input)

examples/proxy/README.md

@@ -26,6 +26,6 @@ In order to test it out you need to do the following:
 1. Now you are able to run the operations provided by the `flipper` smart contract via
    the `proxy` contract.
 
-To upgrade the address of the smart contract where calls are forwarded to you would
+To change the address of the smart contract where calls are forwarded to you would
 switch the metadata (i.e. the `Contract ABI`) back to the `proxy` contract
-and then invoke the `upgrade` message.
+and then invoke the `change_forward_address` message.

examples/proxy/lib.rs

@@ -29,11 +29,16 @@ pub mod proxy {
             }
         }
 
-        /// Forward everything to the next contract
+        /// Changes the `AccountId` of the contract where any call that does
+        /// not match a selector of this contract is forwarded to.
         #[ink(message)]
-        pub fn upgrade(&mut self, new_forward_addr: AccountId) {
-            assert_eq!(self.env().caller(), self.admin);
-            self.forward_to = new_forward_addr;
+        pub fn change_forward_address(&mut self, new_address: AccountId) {
+            assert_eq!(
+                self.env().caller(),
+                self.admin,
+                "caller does not have sufficient permissions"
+            );
+            self.forward_to = new_address;
         }
 
         /// Fallback message for a contract call that doesn't match any