Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix ReadOnly resolve
  • Loading branch information
ascjones committed Aug 18, 2020
commit 2899991c12fe08de18a442234d850466f7e32336
3 changes: 1 addition & 2 deletions src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ pub struct RegistryReadOnly {
impl RegistryReadOnly {
/// Returns the type definition for the given identifier, `None` if no type found for that ID.
pub fn resolve(&self, id: NonZeroU32) -> Option<&Type<CompactForm>> {
self.types.get((id.get() - 1) as usize);
None
self.types.get((id.get() - 1) as usize)
}
}
4 changes: 3 additions & 1 deletion test_suite/tests/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern crate alloc;

#[cfg(not(feature = "std"))]
use alloc::{vec, vec::Vec};

use core::num::NonZeroU32;
use pretty_assertions::{assert_eq, assert_ne};
use scale::{Decode, Encode};
use scale_info::{form::CompactForm, IntoCompact as _, MetaType, Registry, RegistryReadOnly, TypeInfo};
Expand Down Expand Up @@ -49,6 +49,7 @@ fn scale_encode_then_decode_to_readonly() {
let original_serialized = serde_json::to_value(registry).unwrap();

let readonly_decoded = RegistryReadOnly::decode(&mut &encoded[..]).unwrap();
assert!(readonly_decoded.resolve(NonZeroU32::new(1).unwrap()).is_some());
let decoded_serialized = serde_json::to_value(readonly_decoded).unwrap();

assert_eq!(decoded_serialized, original_serialized);
Expand All @@ -62,6 +63,7 @@ fn json_serialize_then_deserialize_to_readonly() {
let original_serialized = serde_json::to_value(registry).unwrap();
// assert_eq!(original_serialized, serde_json::Value::Null);
let readonly_deserialized: RegistryReadOnly = serde_json::from_value(original_serialized.clone()).unwrap();
assert!(readonly_deserialized.resolve(NonZeroU32::new(1).unwrap()).is_some());
let readonly_serialized = serde_json::to_value(readonly_deserialized).unwrap();

assert_eq!(readonly_serialized, original_serialized);
Expand Down