refactor client module to requester
Change-Id: I2b9835af7f03942bfdb6a886c95cfb4b907e2068
diff --git a/src/protocol-detail/error.cpp b/src/protocol-detail/error.cpp
index b74180b..dabfa6a 100644
--- a/src/protocol-detail/error.cpp
+++ b/src/protocol-detail/error.cpp
@@ -37,16 +37,11 @@
ErrorTLV::decodefromDataContent(const Block& block)
{
block.parse();
+ if (block.find(tlv_error_code) == block.elements_end()) {
+ return std::make_tuple(ErrorCode::NO_ERROR, "");
+ }
ErrorCode error = static_cast<ErrorCode>(readNonNegativeInteger(block.get(tlv_error_code)));
- auto description = readString(block.get(tlv_error_info));
- return std::make_tuple(error, description);
-}
-
-bool
-ErrorTLV::isErrorContent(const Block& block)
-{
- block.parse();
- return block.find(tlv_error_code) != block.elements_end();
+ return std::make_tuple(error, readString(block.get(tlv_error_info)));
}
} // namespace ndncert