Fix validator id decoding

sigp · Sep 5, 2020 · e76d476 · e76d476
1 parent d9f5773
commit e76d476
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/beacon_node/http_api/tests/tests.rs b/beacon_node/http_api/tests/tests.rs
@@ -333,18 +333,11 @@ impl ApiTester {
                         .unwrap()
                         .map(|res| res.data);
 
-                    let state = if let Some(state) = state_opt.as_ref() {
-                        state
-                    } else {
-                        if result.is_none() {
-                            continue;
-                        } else {
-                            panic!(
-                                "should have returned none: {:?}, {:?}",
-                                state_id, validator_id
-                            )
-                        }
-                    };
+                    if result.is_none() && state_opt.is_none() {
+                        continue;
+                    }
+
+                    let state = state_opt.as_ref().expect("result should be none");
 
                     let expected = {
                         let epoch = state.current_epoch();

diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs
@@ -144,7 +144,7 @@ impl FromStr for ValidatorId {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if s.starts_with("0x") {
-            serde_json::from_str(s)
+            serde_json::from_str(&format!("\"{}\"", s))
                 .map(ValidatorId::PublicKey)
                 .map_err(|_| format!("{} cannot be parsed as a public key", s))
         } else {