From 96e864e4e95f91075a74e7629e4f39d631dc00a6 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Wed, 6 Dec 2023 13:29:08 +0100 Subject: [PATCH] Fix incorrectly resolved merge conflict, left too much code. --- assignment-client/src/avatars/MixerAvatar.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/assignment-client/src/avatars/MixerAvatar.h b/assignment-client/src/avatars/MixerAvatar.h index 95277be127..aaf55200f0 100644 --- a/assignment-client/src/avatars/MixerAvatar.h +++ b/assignment-client/src/avatars/MixerAvatar.h @@ -45,21 +45,6 @@ private: bool _needsHeroCheck { false }; bool _needsIdentityUpdate { false }; - bool generateFSTHash(); - bool validateFSTHash(const QString& publicKey) const; - QByteArray canonicalJson(const QString fstFile); - void requestCurrentOwnership(); - void sendOwnerChallenge(); - - static const QString VERIFY_FAIL_MODEL; - -private slots: - void fstRequestComplete(); - void ownerRequestComplete(); - void challengeTimeout(); - - signals: - void startChallengeTimer(); }; using MixerAvatarSharedPointer = std::shared_ptr;