works

dfinity · Dec 4, 2022 · 0b88a37 · 0b88a37
1 parent 607b769
commit 0b88a37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/rust/candid/src/de.rs b/rust/candid/src/de.rs
@@ -694,7 +694,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
                     visitor.visit_map(Compound::new(self, Style::Struct { expect, wire }))?;
                 Ok(value)
             }
-            (Type::Record(_), Type::Empty) => Err(Error::msg("Cannot decode empty type")),
+            //(Type::Record(_), Type::Empty) => Err(Error::msg("Cannot decode empty type")),
             _ => assert!(false),
         }
     }
@@ -837,8 +837,16 @@ impl<'de, 'a> de::MapAccess<'de> for Compound<'a, 'de> {
                             }
                             Ordering::Less => {
                                 // by subtyping rules, expect_type can only be opt, reserved or null.
-                                self.de.set_field_name(e.id.clone());
+                                let field = e.id.clone();
+                                self.de.set_field_name(field.clone());
                                 self.de.expect_type = expect.pop_front().unwrap().ty;
+                                check!(
+                                    matches!(
+                                        self.de.expect_type,
+                                        Type::Opt(_) | Type::Reserved | Type::Null
+                                    ),
+                                    format!("field {} is not optional field", field)
+                                );
                                 self.de.wire_type = Type::Reserved;
                             }
                             Ordering::Greater => {

diff --git a/rust/candid/tests/serde.rs b/rust/candid/tests/serde.rs
@@ -317,10 +317,7 @@ fn test_extra_fields() {
 
     let bytes = encode(&E2::Foo);
     test_decode(&bytes, &Some(E2::Foo));
-    check_error(
-        || test_decode(&bytes, &E1::Foo),
-        "Variant field 3_303_867 not found",
-    );
+    test_decode(&bytes, &E1::Foo);
 }
 
 #[test]