Skip to content

Commit f7924fc

Browse files
bifurcationRichard Barnes
and
Richard Barnes
authored
Use MLS_NAMESPACE everywhere needed (#437)
Co-authored-by: Richard Barnes <[email protected]>
1 parent 7ee4705 commit f7924fc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

lib/hpke/test/userinfo_vc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace opt = MLS_NAMESPACE::tls::opt;
88
using namespace MLS_NAMESPACE::hpke;
99
using namespace std::string_literals;
1010

11-
namespace mls::hpke {
11+
namespace MLS_NAMESPACE::hpke {
1212

1313
static bool
1414
operator==(const Signature::PublicJWK& lhs, const Signature::PublicJWK& rhs)

lib/mls_ds/src/tree_follower.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,17 @@ TreeFollower::TreeFollower(TreeKEMPublicKey tree)
136136
}
137137

138138
void
139-
TreeFollower::update(const mls::MLSMessage& commit_message,
140-
const std::vector<mls::MLSMessage>& extra_proposals)
139+
TreeFollower::update(const MLSMessage& commit_message,
140+
const std::vector<MLSMessage>& extra_proposals)
141141
{
142142
// Unwrap the Commit
143143
const auto& commit_public_message =
144-
var::get<mls::PublicMessage>(commit_message.message);
144+
var::get<PublicMessage>(commit_message.message);
145145
const auto commit_auth_content =
146146
commit_public_message.authenticated_content();
147147
const auto group_content = commit_auth_content.content;
148148
const auto& commit =
149-
var::get<mls::Commit>(commit_auth_content.content.content);
149+
var::get<Commit>(commit_auth_content.content.content);
150150

151151
// Apply proposals
152152
apply(_tree, _suite, group_content.sender, commit.proposals, extra_proposals);
@@ -156,7 +156,7 @@ TreeFollower::update(const mls::MLSMessage& commit_message,
156156
// Merge the update path
157157
if (commit.path) {
158158
const auto sender =
159-
var::get<mls::MemberSender>(group_content.sender.sender);
159+
var::get<MemberSender>(group_content.sender.sender);
160160
const auto from = LeafIndex(sender.sender);
161161
const auto& path = opt::get(commit.path);
162162
_tree.merge(from, path);

test/grease.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <mls/core_types.h>
44
#include <mls/messages.h>
55

6-
using namespace mls;
6+
using namespace MLS_NAMESPACE;
77

88
TEST_CASE("GREASE capabilities")
99
{

0 commit comments

Comments
 (0)