fixing tests

Author: xunilrj

forc-plugins/forc-doc/src/tests/expects/impl_trait/mod.rs

@@ -53,14 +53,20 @@ pub fn zero_alloc_slice<T>() -> &mut [T] {
 }
 
 pub fn alloc_slice<T>(len: u64) -> &mut [T] {
-    asm(a:1) { log a a a a; }
+    asm(a: 1) {
+        log a a a a;
+    }
     let len_in_bytes = __mul(len, __size_of::<T>());
-    asm(a:1) { log a a a a; }
+    asm(a: 1) {
+        log a a a a;
+    }
     let ptr = asm(len_in_bytes: len_in_bytes) {
         aloc len_in_bytes;
         hp: raw_ptr
     };
-    asm(a:1) { log a a a a; }
+    asm(a: 1) {
+        log a a a a;
+    }
     asm(buf: (ptr, len)) {
         buf: &mut [T]
     }

sway-lib-core/src/slice.sw

@@ -6,7 +6,7 @@ use ::hash::*;
 use ::option::Option::{self, *};
 use ::storage::storage_api::*;
 use ::storage::storage_key::*;
-use ::vec::{VecIter, Vec};
+use ::vec::{Vec, VecIter};
 use ::iterator::Iterator;
 
 /// A persistent vector struct.

sway-lib-std/src/storage/storage_vec.sw

@@ -856,24 +856,64 @@ fn ok_vec_tests() {
 
     // resize
     v.resize(13, 7);
-    assert_vec_items(v, __slice(&[1u8, 2u8, 5u8, 4u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8], 0, 13), 13);
+    assert_vec_items(
+        v,
+        __slice(
+            &[1u8, 2u8, 5u8, 4u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8],
+            0,
+            13,
+        ),
+        13,
+    );
 
     // set
     v.set(0, 7);
-    assert_vec_items(v, __slice(&[7u8, 2u8, 5u8, 4u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8], 0, 13), 13);
+    assert_vec_items(
+        v,
+        __slice(
+            &[7u8, 2u8, 5u8, 4u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8],
+            0,
+            13,
+        ),
+        13,
+    );
 
     // swap
     v.swap(1, 3);
-    assert_vec_items(v, __slice(&[7u8, 4u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8], 0, 13), 13);
+    assert_vec_items(
+        v,
+        __slice(
+            &[7u8, 4u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8],
+            0,
+            13,
+        ),
+        13,
+    );
 
     // remove middle
     let item = v.remove(1);
     assert_eq(item, 4);
-    assert_vec_items(v, __slice(&[7u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8], 0, 12), 13);
+    assert_vec_items(
+        v,
+        __slice(
+            &[7u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8],
+            0,
+            12,
+        ),
+        13,
+    );
 
     let encoded_bytes = encode(v);
     let mut v = abi_decode::<Vec<u8>>(encoded_bytes);
-    assert_vec_items(v, __slice(&[7u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8], 0, 12), 12);
+    assert_vec_items(
+        v,
+        __slice(
+            &[7u8, 5u8, 2u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8, 7u8],
+            0,
+            12,
+        ),
+        12,
+    );
 
     // clear
     v.clear();
@@ -917,7 +957,7 @@ fn ok_vec_as_raw_slice() {
     assert_vec_items(v, __slice(&[1u8, 2u8, 3u8], 0, 3), 4);
 
     let v_as_slice: raw_slice = v.as_raw_slice();
-    let mut v2: Vec<u8> =  v_as_slice.into();
+    let mut v2: Vec<u8> = v_as_slice.into();
 
     assert_vec_items(v2, __slice(&[1u8, 2u8, 3u8], 0, 3), 3);
 }

sway-lib-std/src/vec.sw

@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x94db39f409a31b9f2ebcadeea44378e419208c20de90f5d8e1e33dc1523754cb;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xe80512481a7ab2251f1d37efb67c995b89a7821e61ce5d46a4f09c0360a716ee; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
+const CONTRACT_ID = 0x4476c28223232eb8fff386bccd3c752cb304c89344690416259fae74a1315525; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw

@@ -617,7 +617,7 @@ fn vec_ptr() {
 
     let mut new_vec: Vec<u64> = Vec::new();
     let new_vec_ptr = new_vec.ptr();
-    assert(!new_vec_ptr.is_null());
+    assert(new_vec_ptr.is_null());
 
     let mut capacity_vec: Vec<u64> = Vec::with_capacity(16);
     let capacity_vec_ptr = capacity_vec.ptr();