Skip to content

Commit 60daeb7

Browse files
authored
Refactor: extractSignatureBytes to use stringToByteVector and add tra… (#1230)
Signed-off-by: Mascud Muse Hassan <mascuudmusse44@gmail.com>
1 parent 868ab27 commit 60daeb7

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

src/sdk/main/src/Transaction.cc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,21 @@ namespace Hiero
8080
namespace
8181
{
8282
/**
83-
* Helper function - Extract the raw signature bytes from a protobuf SignaturePair.
83+
* Extract the raw signature bytes from a protobuf SignaturePair.
8484
*/
8585
std::vector<std::byte> extractSignatureBytes(const proto::SignaturePair& pair)
8686
{
87-
const std::string* sigStr = nullptr;
8887
if (pair.has_ed25519())
8988
{
90-
sigStr = &pair.ed25519();
89+
return internal::Utilities::stringToByteVector(pair.ed25519());
9190
}
92-
else if (pair.has_ecdsa_secp256k1())
93-
{
94-
sigStr = &pair.ecdsa_secp256k1();
95-
}
96-
else
91+
92+
if (pair.has_ecdsa_secp256k1())
9793
{
98-
throw IllegalStateException("Unknown signature type");
94+
return internal::Utilities::stringToByteVector(pair.ecdsa_secp256k1());
9995
}
10096

101-
std::vector<std::byte> sigBytes(sigStr->size());
102-
std::transform(sigStr->begin(), sigStr->end(), sigBytes.begin(), [](char c) { return static_cast<std::byte>(c); });
103-
return sigBytes;
97+
throw IllegalStateException("Unknown signature type");
10498
}
10599
} // anonymous namespace
106100

src/sdk/tests/unit/TransactionUnitTests.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3173,4 +3173,4 @@ TEST_F(TransactionUnitTests, RemoveSignatureFromMultiNodeTransaction)
31733173
// Then
31743174
// Verify that all internal signatory tracking and protobuf signature maps are completely clear
31753175
EXPECT_EQ(finalRemoval.size(), 0);
3176-
}
3176+
}

0 commit comments

Comments
 (0)