rpc: include OBJ_USER_KEY in RPCArg constructor checks

kallewoof · kallewoof · commit d9e2183c50f5 · 2021-05-09T22:22:25.000+09:00
diff --git a/src/rpc/util.h b/src/rpc/util.h
@@ -173,7 +173,7 @@ struct RPCArg {
           m_oneline_description{std::move(oneline_description)},
           m_type_str{std::move(type_str)}
     {
-        CHECK_NONFATAL(type != Type::ARR && type != Type::OBJ);
+        CHECK_NONFATAL(type != Type::ARR && type != Type::OBJ && type != Type::OBJ_USER_KEYS);
     }
 
     RPCArg(
@@ -193,7 +193,7 @@ struct RPCArg {
           m_oneline_description{std::move(oneline_description)},
           m_type_str{std::move(type_str)}
     {
-        CHECK_NONFATAL(type == Type::ARR || type == Type::OBJ);
+        CHECK_NONFATAL(type == Type::ARR || type == Type::OBJ || type == Type::OBJ_USER_KEYS);
     }
 
     bool IsOptional() const;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ struct RPCArg {`
`173`	`173`	`m_oneline_description{std::move(oneline_description)},`
`174`	`174`	`m_type_str{std::move(type_str)}`
`175`	`175`	`{`
`176`		`- CHECK_NONFATAL(type != Type::ARR && type != Type::OBJ);`
	`176`	`+ CHECK_NONFATAL(type != Type::ARR && type != Type::OBJ && type != Type::OBJ_USER_KEYS);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`RPCArg(`
`@@ -193,7 +193,7 @@ struct RPCArg {`
`193`	`193`	`m_oneline_description{std::move(oneline_description)},`
`194`	`194`	`m_type_str{std::move(type_str)}`
`195`	`195`	`{`
`196`		`- CHECK_NONFATAL(type == Type::ARR \|\| type == Type::OBJ);`
	`196`	`+ CHECK_NONFATAL(type == Type::ARR \|\| type == Type::OBJ \|\| type == Type::OBJ_USER_KEYS);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`bool IsOptional() const;`