commit 22bcb07d7f48f5ff237776bf6450baca3875db20
author ManojKiran Eda <manojkiran.eda@gmail.com> Fri Jul 11 23:49:43 2025 +0000
committer ManojKiran Eda <manojkiran.eda@gmail.com> Sat Jul 12 00:20:05 2025 +0000
tree 712af1b1d5eec83da8c6d155d554fe045e25bcd5
parent 42053e6f26115968822cba36e4e90cb560b4928a

Revert "pldm: use std::expected for instance ID allocation"

This reverts commit 70262ed7bf854b25d4b65628bc3c892ddfe9380f.

Change-Id: I1f54d6b60bf3cfa9f00764140eec6167e1e182d6
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>

requester/test/handler_test.cpp

diff --git a/requester/test/handler_test.cpp b/requester/test/handler_test.cpp
index ebccdf7..caa4663 100644
--- a/requester/test/handler_test.cpp
+++ b/requester/test/handler_test.cpp
@@ -79,9 +79,7 @@
         pldmTransport, event, instanceIdDb, false, seconds(1), 2,
         milliseconds(100));
     pldm::Request request{};
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
     EXPECT_EQ(instanceId, 0);
     auto rc = reqHandler.registerRequest(
         eid, instanceId, 0, 0, std::move(request),
@@ -104,9 +102,7 @@
         pldmTransport, event, instanceIdDb, false, seconds(1), 2,
         milliseconds(100));
     pldm::Request request{};
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
     EXPECT_EQ(instanceId, 0);
     auto rc = reqHandler.registerRequest(
         eid, instanceId, 0, 0, std::move(request),
@@ -127,9 +123,7 @@
         pldmTransport, event, instanceIdDb, false, seconds(2), 2,
         milliseconds(100));
     pldm::Request request{};
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
     EXPECT_EQ(instanceId, 0);
     auto rc = reqHandler.registerRequest(
         eid, instanceId, 0, 0, std::move(request),
@@ -139,10 +133,7 @@
     EXPECT_EQ(rc, PLDM_SUCCESS);
 
     pldm::Request requestNxt{};
-    auto instanceIdNxtResult =
-        pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdNxtResult);
-    auto instanceIdNxt = instanceIdNxtResult.value();
+    auto instanceIdNxt = instanceIdDb.next(eid);
     EXPECT_EQ(instanceIdNxt, 1);
     rc = reqHandler.registerRequest(
         eid, instanceIdNxt, 0, 0, std::move(requestNxt),
@@ -177,9 +168,7 @@
         pldmTransport, event, instanceIdDb, false, seconds(1), 2,
         milliseconds(100));
 
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
     EXPECT_EQ(instanceId, 0);
 
     scope.spawn(
@@ -225,9 +214,7 @@
     Handler<NiceMock<MockRequest>> reqHandler(
         pldmTransport, event, instanceIdDb, false, seconds(1), 2,
         milliseconds(100));
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
     EXPECT_EQ(instanceId, 0);
 
     bool stopped = false;
@@ -284,9 +271,7 @@
     exec::async_scope scope;
     Handler<MockRequest> reqHandler(pldmTransport, event, instanceIdDb, false,
                                     seconds(1), 2, milliseconds(100));
-    auto instanceIdResult = pldm::utils::getInstanceId(instanceIdDb.next(eid));
-    ASSERT_TRUE(instanceIdResult);
-    auto instanceId = instanceIdResult.value();
+    auto instanceId = instanceIdDb.next(eid);
 
     uint8_t expectedTid = 1;