Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix containing StorageStrings in StorageVecs #6043

Merged
merged 2 commits into from
May 22, 2024
Merged

Fix containing StorageStrings in StorageVecs #6043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30e2462
Fix nesting `StorageString` in `StorageVec`
ironcev May 21, 2024
a2e7891
Fix failing test
ironcev May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions sway-lib-std/src/storage/storage_map.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,8 @@ where
where
K: Hash,
{
StorageKey::<V>::new(
sha256((key, self.field_id())),
0,
sha256((key, self.field_id())),
)
let key = sha256((key, self.field_id()));
StorageKey::<V>::new(key, 0, key)
}

/// Clears a value previously stored using a key
Expand Down
8 changes: 4 additions & 4 deletions sway-lib-std/src/storage/storage_string.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl StorableSlice<String> for StorageKey<StorageString> {
/// ```
#[storage(read, write)]
fn write_slice(self, string: String) {
write_slice(self.slot(), string.as_raw_slice());
write_slice(self.field_id(), string.as_raw_slice());
}

/// Constructs a `String` type from storage.
Expand Down Expand Up @@ -69,7 +69,7 @@ impl StorableSlice<String> for StorageKey<StorageString> {
/// ```
#[storage(read)]
fn read_slice(self) -> Option<String> {
match read_slice(self.slot()) {
match read_slice(self.field_id()) {
Some(slice) => {
Some(String::from(slice))
},
Expand Down Expand Up @@ -111,7 +111,7 @@ impl StorableSlice<String> for StorageKey<StorageString> {
/// ```
#[storage(read, write)]
fn clear(self) -> bool {
clear_slice(self.slot())
clear_slice(self.field_id())
}

/// Returns the length of `String` in storage.
Expand Down Expand Up @@ -143,6 +143,6 @@ impl StorableSlice<String> for StorageKey<StorageString> {
/// ```
#[storage(read)]
fn len(self) -> u64 {
read::<u64>(self.slot(), 0).unwrap_or(0)
read::<u64>(self.field_id(), 0).unwrap_or(0)
}
}
58 changes: 29 additions & 29 deletions sway-lib-std/src/storage/storage_vec.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl<V> StorageKey<StorageVec<V>> {
/// fn foo() {
/// let five = 5_u64;
/// storage.vec.push(five);
/// assert(five == storage.vec.get(0).unwrap());
/// assert(five == storage.vec.get(0).unwrap().read());
/// }
/// ```
#[storage(read, write)]
Expand Down Expand Up @@ -77,7 +77,7 @@ impl<V> StorageKey<StorageVec<V>> {
/// let popped_value = storage.vec.pop().unwrap();
/// assert(five == popped_value);
/// let none_value = storage.vec.pop();
/// assert(none_value.is_none())
/// assert(none_value.is_none());
/// }
/// ```
#[storage(read, write)]
Expand Down Expand Up @@ -124,8 +124,8 @@ impl<V> StorageKey<StorageVec<V>> {
/// fn foo() {
/// let five = 5_u64;
/// storage.vec.push(five);
/// assert(five == storage.vec.get(0).unwrap());
/// assert(storage.vec.get(1).is_none())
/// assert(five == storage.vec.get(0).unwrap().read());
/// assert(storage.vec.get(1).is_none());
/// }
/// ```
#[storage(read)]
Expand Down Expand Up @@ -253,7 +253,7 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(15);
/// let removed_value = storage.vec.swap_remove(0);
/// assert(5 == removed_value);
/// let swapped_value = storage.vec.get(0).unwrap();
/// let swapped_value = storage.vec.get(0).unwrap().read();
/// assert(15 == swapped_value);
/// }
/// ```
Expand Down Expand Up @@ -311,7 +311,7 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(15);
///
/// storage.vec.set(0, 20);
/// let set_value = storage.vec.get(0).unwrap();
/// let set_value = storage.vec.get(0).unwrap().read();
/// assert(20 == set_value);
/// }
/// ```
Expand Down Expand Up @@ -363,9 +363,9 @@ impl<V> StorageKey<StorageVec<V>> {
///
/// storage.vec.insert(1, 10);
///
/// assert(5 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(15 == storage.vec.get(2).unwrap());
/// assert(5 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(15 == storage.vec.get(2).unwrap().read());
/// }
/// ```
#[storage(read, write)]
Expand Down Expand Up @@ -510,9 +510,9 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(15);
///
/// storage.vec.swap(0, 2);
/// assert(15 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(5 == storage.vec.get(2).unwrap());
/// assert(15 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(5 == storage.vec.get(2).unwrap().read());
/// ```
#[storage(read, write)]
pub fn swap(self, element1_index: u64, element2_index: u64) {
Expand Down Expand Up @@ -562,7 +562,7 @@ impl<V> StorageKey<StorageVec<V>> {
///
/// storage.vec.push(5);
///
/// assert(5 == storage.vec.first().unwrap());
/// assert(5 == storage.vec.first().unwrap().read());
/// }
/// ```
#[storage(read)]
Expand Down Expand Up @@ -598,7 +598,7 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(5);
/// storage.vec.push(10);
///
/// assert(10 == storage.vec.last().unwrap());
/// assert(10 == storage.vec.last().unwrap().read());
/// }
/// ```
#[storage(read)]
Expand Down Expand Up @@ -633,9 +633,9 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(15);
/// storage.vec.reverse();
///
/// assert(15 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(5 == storage.vec.get(2).unwrap());
/// assert(15 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(5 == storage.vec.get(2).unwrap().read());
/// }
/// ```
#[storage(read, write)]
Expand Down Expand Up @@ -686,9 +686,9 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(15);
/// storage.vec.fill(20);
///
/// assert(20 == storage.vec.get(0).unwrap());
/// assert(20 == storage.vec.get(1).unwrap());
/// assert(20 == storage.vec.get(2).unwrap());
/// assert(20 == storage.vec.get(0).unwrap().read());
/// assert(20 == storage.vec.get(1).unwrap().read());
/// assert(20 == storage.vec.get(2).unwrap().read());
/// }
/// ```
#[storage(read, write)]
Expand Down Expand Up @@ -734,15 +734,15 @@ impl<V> StorageKey<StorageVec<V>> {
/// storage.vec.push(10);
/// storage.vec.resize(4, 20);
///
/// assert(5 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(20 == storage.vec.get(2).unwrap());
/// assert(20 == storage.vec.get(3).unwrap());
/// assert(5 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(20 == storage.vec.get(2).unwrap().read());
/// assert(20 == storage.vec.get(3).unwrap().read());
///
/// storage.vec.resize(2, 0);
///
/// assert(5 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(5 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(None == storage.vec.get(2));
/// assert(None == storage.vec.get(3));
/// }
Expand Down Expand Up @@ -802,9 +802,9 @@ impl<V> StorageKey<StorageVec<V>> {
///
/// storage.vec.store_vec(vec);
///
/// assert(5 == storage.vec.get(0).unwrap());
/// assert(10 == storage.vec.get(1).unwrap());
/// assert(15 == storage.vec.get(2).unwrap());
/// assert(5 == storage.vec.get(0).unwrap().read());
/// assert(10 == storage.vec.get(1).unwrap().read());
/// assert(15 == storage.vec.get(2).unwrap().read());
/// }
/// ```
#[storage(write)]
Expand Down
5 changes: 5 additions & 0 deletions test/src/sdk-harness/Forc.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ name = "storage_vec_nested"
source = "member"
dependencies = ["std"]

[[package]]
name = "storage_vec_of_storage_string"
source = "member"
dependencies = ["std"]

[[package]]
name = "storage_vec_to_vec"
source = "member"
Expand Down
1 change: 1 addition & 0 deletions test/src/sdk-harness/Forc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ members = [
"test_projects/storage_map_nested",
"test_projects/storage_string",
"test_projects/storage_vec_nested",
"test_projects/storage_vec_of_storage_string",
"test_projects/storage_vec_to_vec",
"test_projects/superabi",
"test_projects/superabi_supertrait",
Expand Down
8 changes: 4 additions & 4 deletions test/src/sdk-harness/test_artifacts/auth_testing_contract/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ impl AuthTesting for Contract {
caller_is_external()
}

fn returns_msg_sender(expected_id: ContractId) -> bool {
fn returns_msg_sender(_expected_id: ContractId) -> bool {
let result: Result<Identity, AuthError> = msg_sender();
let mut ret = false;
if result.is_err() {
ret = false;
}
let unwrapped = result.unwrap();
match unwrapped {
Identity::ContractId(v) => {
Identity::ContractId(_) => {
ret = true
},
_ => {
Expand All @@ -26,15 +26,15 @@ impl AuthTesting for Contract {
ret
}

fn returns_msg_sender_address(expected_id: Address) -> bool {
fn returns_msg_sender_address(_expected_id: Address) -> bool {
let result: Result<Identity, AuthError> = msg_sender();
let mut ret = false;
if result.is_err() {
ret = false;
}
let unwrapped = result.unwrap();
match unwrapped {
Identity::Address(v) => {
Identity::Address(_) => {
ret = true
},
_ => {
Expand Down
4 changes: 2 additions & 2 deletions test/src/sdk-harness/test_artifacts/methods_contract/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ storage {
impl MethodsContract for Contract {
#[storage(read, write)]
fn test_function() -> bool {
let identity = bogus();
let identity2 = bogus2();
let _ = bogus();
let _ = bogus2();
storage
.stored_struct
.write(MyStruct {
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_array/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_b256/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_bool/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_enum/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_str/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_struct/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_tuple/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_u16/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_u32/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_u64/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 1 addition & 1 deletion test/src/sdk-harness/test_artifacts/storage_vec/svec_u8/src/main.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl MyContract for Contract {

#[storage(write)]
fn clear() {
storage.my_vec.clear();
let _ = storage.my_vec.clear();
}

#[storage(read, write)]
Expand Down
2 changes: 0 additions & 2 deletions test/src/sdk-harness/test_projects/call_frames/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use fuel_vm::consts::VM_MAX_RAM;
use fuels::{accounts::wallet::WalletUnlocked, prelude::*, types::ContractId};

use sha2::{Digest, Sha256};

abigen!(Contract(
name = "CallFramesTestContract",
abi = "test_projects/call_frames/out/release/call_frames-abi.json"
Expand Down
Loading
Loading