Change SpendTokenData to use PublicMetadata instead of PublicMetadataInfo, and update its users.
PiperOrigin-RevId: 525839307
diff --git a/quiche/blind_sign_auth/blind_sign_auth.cc b/quiche/blind_sign_auth/blind_sign_auth.cc
index ed7cbd0..d13dc33 100644
--- a/quiche/blind_sign_auth/blind_sign_auth.cc
+++ b/quiche/blind_sign_auth/blind_sign_auth.cc
@@ -4,7 +4,6 @@
#include "quiche/blind_sign_auth/blind_sign_auth.h"
-#include <algorithm>
#include <cstddef>
#include <functional>
#include <string>
@@ -244,7 +243,8 @@
std::vector<std::string> tokens_vec;
for (size_t i = 0; i < signed_tokens->size(); i++) {
privacy::ppn::SpendTokenData spend_token_data;
- *spend_token_data.mutable_public_metadata() = public_metadata_info;
+ *spend_token_data.mutable_public_metadata() =
+ public_metadata_info.public_metadata();
*spend_token_data.mutable_unblinded_token() =
signed_tokens->at(i).input().plaintext_message();
*spend_token_data.mutable_unblinded_token_signature() =
diff --git a/quiche/blind_sign_auth/blind_sign_auth_test.cc b/quiche/blind_sign_auth/blind_sign_auth_test.cc
index 5f0dc1e..bb9d8da 100644
--- a/quiche/blind_sign_auth/blind_sign_auth_test.cc
+++ b/quiche/blind_sign_auth/blind_sign_auth_test.cc
@@ -135,7 +135,7 @@
ASSERT_TRUE(spend_token_data.ParseFromString(token));
// Validate token structure.
EXPECT_EQ(spend_token_data.public_metadata().SerializeAsString(),
- public_metadata_info_.SerializeAsString());
+ public_metadata_info_.public_metadata().SerializeAsString());
EXPECT_THAT(spend_token_data.unblinded_token(), StartsWith("blind:"));
EXPECT_GE(spend_token_data.unblinded_token_signature().size(),
spend_token_data.unblinded_token().size());
diff --git a/quiche/blind_sign_auth/proto/spend_token_data.proto b/quiche/blind_sign_auth/proto/spend_token_data.proto
index a70bb80..68c2e6c 100644
--- a/quiche/blind_sign_auth/proto/spend_token_data.proto
+++ b/quiche/blind_sign_auth/proto/spend_token_data.proto
@@ -22,7 +22,7 @@
message SpendTokenData {
// Public metadata associated with the token being spent.
// See go/ppn-token-spend and go/ppn-phosphor-at-service for details.
- PublicMetadataInfo public_metadata = 1;
+ PublicMetadata public_metadata = 1;
// The unblinded token to be spent which was blind-signed by Phosphor.
bytes unblinded_token = 2;
// The signature for the token to be spent, obtained from Phosphor and
