From 27e1110febba39e525c5d0aa244bfedff3c4c1b7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 16 Mar 2020 10:40:31 +0100 Subject: [PATCH] Rename Map is_linked -> unused, keeping backwards compat --- frame/metadata/src/lib.rs | 4 ++-- frame/support/procedural/src/storage/metadata.rs | 2 +- frame/support/src/lib.rs | 8 ++++---- frame/support/test/tests/decl_storage.rs | 16 ++++++++-------- frame/support/test/tests/instance.rs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frame/metadata/src/lib.rs b/frame/metadata/src/lib.rs index 3919183b9e582..bec69999b2187 100644 --- a/frame/metadata/src/lib.rs +++ b/frame/metadata/src/lib.rs @@ -289,9 +289,9 @@ pub enum StorageEntryType { hasher: StorageHasher, key: DecodeDifferentStr, value: DecodeDifferentStr, - is_linked: bool, + // is_linked flag previously, unused now to keep backwards compat + unused: bool, }, - Unused, DoubleMap { hasher: StorageHasher, key1: DecodeDifferentStr, diff --git a/frame/support/procedural/src/storage/metadata.rs b/frame/support/procedural/src/storage/metadata.rs index eff52163a6981..bb23c99d9df51 100644 --- a/frame/support/procedural/src/storage/metadata.rs +++ b/frame/support/procedural/src/storage/metadata.rs @@ -41,7 +41,7 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) -> hasher: #scrate::metadata::#hasher, key: #scrate::metadata::DecodeDifferent::Encode(#key), value: #scrate::metadata::DecodeDifferent::Encode(#value_type), - is_linked: false, + unused: false, } } }, diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs index 58c657ad3af45..8fe32cbda9999 100644 --- a/frame/support/src/lib.rs +++ b/frame/support/src/lib.rs @@ -498,7 +498,7 @@ mod tests { hasher: StorageHasher::Twox64Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("u64"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructData(PhantomData::)) @@ -512,7 +512,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("u32"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructOptionLinkedMap(PhantomData::)) @@ -526,7 +526,7 @@ mod tests { hasher: StorageHasher::Identity, key: DecodeDifferent::Encode("T::BlockNumber"), value: DecodeDifferent::Encode("T::BlockNumber"), - is_linked: false + unused: false }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructGenericData(PhantomData::)) @@ -540,7 +540,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("T::BlockNumber"), value: DecodeDifferent::Encode("T::BlockNumber"), - is_linked: false + unused: false }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructGenericData2(PhantomData::)) diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs index bf67e0f57f84d..ea9b09f9d7bc2 100644 --- a/frame/support/test/tests/decl_storage.rs +++ b/frame/support/test/tests/decl_storage.rs @@ -244,7 +244,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructMAPU32(PhantomData::)) @@ -258,7 +258,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructPUBMAPU32(PhantomData::)) @@ -272,7 +272,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructMAPU32MYDEF(PhantomData::)) @@ -286,7 +286,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructPUBMAPU32MYDEF(PhantomData::)) @@ -300,7 +300,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructGETMAPU32(PhantomData::)) @@ -314,7 +314,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructPUBGETMAPU32(PhantomData::)) @@ -328,7 +328,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructGETMAPU32MYDEF(PhantomData::)) @@ -342,7 +342,7 @@ mod tests { hasher: StorageHasher::Blake2_128Concat, key: DecodeDifferent::Encode("u32"), value: DecodeDifferent::Encode("String"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(&__GetByteStructPUBGETMAPU32MYDEF(PhantomData::)) diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs index 6b13d53981803..92281ef1311a7 100644 --- a/frame/support/test/tests/instance.rs +++ b/frame/support/test/tests/instance.rs @@ -390,7 +390,7 @@ const EXPECTED_METADATA: StorageMetadata = StorageMetadata { hasher: StorageHasher::Identity, key: DecodeDifferent::Encode("u64"), value: DecodeDifferent::Encode("u64"), - is_linked: false, + unused: false, }, default: DecodeDifferent::Encode( DefaultByteGetter(