Skip to content

Commit

Permalink
Use MLS_NAMESPACE everywhere needed (#437)
Browse files Browse the repository at this point in the history
Co-authored-by: Richard Barnes <[email protected]>
  • Loading branch information
bifurcation and Richard Barnes authored Nov 5, 2024
1 parent 7ee4705 commit f7924fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/hpke/test/userinfo_vc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace opt = MLS_NAMESPACE::tls::opt;
using namespace MLS_NAMESPACE::hpke;
using namespace std::string_literals;

namespace mls::hpke {
namespace MLS_NAMESPACE::hpke {

static bool
operator==(const Signature::PublicJWK& lhs, const Signature::PublicJWK& rhs)
Expand Down
10 changes: 5 additions & 5 deletions lib/mls_ds/src/tree_follower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@ TreeFollower::TreeFollower(TreeKEMPublicKey tree)
}

void
TreeFollower::update(const mls::MLSMessage& commit_message,
const std::vector<mls::MLSMessage>& extra_proposals)
TreeFollower::update(const MLSMessage& commit_message,
const std::vector<MLSMessage>& extra_proposals)
{
// Unwrap the Commit
const auto& commit_public_message =
var::get<mls::PublicMessage>(commit_message.message);
var::get<PublicMessage>(commit_message.message);
const auto commit_auth_content =
commit_public_message.authenticated_content();
const auto group_content = commit_auth_content.content;
const auto& commit =
var::get<mls::Commit>(commit_auth_content.content.content);
var::get<Commit>(commit_auth_content.content.content);

// Apply proposals
apply(_tree, _suite, group_content.sender, commit.proposals, extra_proposals);
Expand All @@ -156,7 +156,7 @@ TreeFollower::update(const mls::MLSMessage& commit_message,
// Merge the update path
if (commit.path) {
const auto sender =
var::get<mls::MemberSender>(group_content.sender.sender);
var::get<MemberSender>(group_content.sender.sender);
const auto from = LeafIndex(sender.sender);
const auto& path = opt::get(commit.path);
_tree.merge(from, path);
Expand Down
2 changes: 1 addition & 1 deletion test/grease.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <mls/core_types.h>
#include <mls/messages.h>

using namespace mls;
using namespace MLS_NAMESPACE;

TEST_CASE("GREASE capabilities")
{
Expand Down

0 comments on commit f7924fc

Please sign in to comment.