Merge branch 'master' into ag-libsecp256k1-remove

use-ink · May 11, 2022 · b0237bf · b0237bf
2 parents 67c373b + 32e0261
commit b0237bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/crates/env/src/call/execution_input.rs b/crates/env/src/call/execution_input.rs
@@ -49,7 +49,7 @@ impl ExecutionInput<EmptyArgumentList> {
     }
 }
 
-impl<'a, Head, Rest> ExecutionInput<ArgumentList<Argument<Head>, Rest>> {
+impl<Head, Rest> ExecutionInput<ArgumentList<Argument<Head>, Rest>> {
     /// Pushes an argument to the execution input.
     #[inline]
     pub fn push_arg<T>(self, arg: T) -> ExecutionInput<ArgsList<T, ArgsList<Head, Rest>>>
@@ -167,7 +167,7 @@ impl scale::Encode for EmptyArgumentList {
     fn encode_to<O: scale::Output + ?Sized>(&self, _output: &mut O) {}
 }
 
-impl<'a, Head, Rest> scale::Encode for ArgumentList<Argument<Head>, Rest>
+impl<Head, Rest> scale::Encode for ArgumentList<Argument<Head>, Rest>
 where
     Head: scale::Encode,
     Rest: scale::Encode,

diff --git a/crates/env/src/engine/on_chain/ext.rs b/crates/env/src/engine/on_chain/ext.rs
@@ -237,6 +237,8 @@ mod sys {
             output_len_ptr: Ptr32Mut<u32>,
         ) -> ReturnCode;
 
+        pub fn seal_contains_storage(key_ptr: Ptr32<[u8]>) -> ReturnCode;
+
         pub fn seal_clear_storage(key_ptr: Ptr32<[u8]>);
 
         pub fn seal_call_chain_extension(
@@ -359,6 +361,12 @@ mod sys {
             output_ptr: Ptr32Mut<[u8]>,
             output_len_ptr: Ptr32Mut<u32>,
         ) -> ReturnCode;
+
+        pub fn seal_set_storage(
+            key_ptr: Ptr32<[u8]>,
+            value_ptr: Ptr32<[u8]>,
+            value_len: u32,
+        ) -> ReturnCode;
     }
 
     #[link(wasm_import_module = "__unstable__")]
@@ -375,14 +383,6 @@ mod sys {
             public_key_ptr: Ptr32<[u8]>,
             output_ptr: Ptr32Mut<[u8]>,
         ) -> ReturnCode;
-
-        pub fn seal_contains_storage(key_ptr: Ptr32<[u8]>) -> ReturnCode;
-
-        pub fn seal_set_storage(
-            key_ptr: Ptr32<[u8]>,
-            value_ptr: Ptr32<[u8]>,
-            value_len: u32,
-        ) -> ReturnCode;
     }
 }
 

diff --git a/crates/storage/src/collections/vec/tests.rs b/crates/storage/src/collections/vec/tests.rs
@@ -399,7 +399,7 @@ fn spread_layout_clear_works() {
 fn set_works() {
     ink_env::test::run_test::<ink_env::DefaultEnvironment, _>(|_| {
         let mut vec = vec_from_slice(&[b'a', b'b', b'c', b'd']);
-        let _ = vec.set(0, b'x').unwrap();
+        vec.set(0, b'x').unwrap();
         let expected = vec_from_slice(&[b'x', b'b', b'c', b'd']);
         assert_eq!(vec, expected);
         Ok(())