Remove files accidentally added back by conflict resolving.
DELETE
WalletWasabi/CoinJoin/Client/Clients/AliceClient.cs
-using NBitcoin;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using WalletWasabi.CoinJoin.Common.Crypto;
-using static WalletWasabi.Crypto.SchnorrBlinding;
-
-namespace WalletWasabi.CoinJoin.Client.Clients
-{
- public class AliceClient : AliceClientBase
- {
- internal AliceClient(
- long roundId,
- IEnumerable<BitcoinAddress> registeredAddresses,
- IEnumerable<SchnorrPubKey> schnorrPubKeys,
- IEnumerable<Requester> requesters,
- Network network,
- Func<Uri> baseUriAction,
- EndPoint torSocks5EndPoint)
- : base(roundId, registeredAddresses, requesters, network, baseUriAction, torSocks5EndPoint)
- {
- SchnorrPubKeys = schnorrPubKeys.ToArray();
- }
-
- public SchnorrPubKey[] SchnorrPubKeys { get; }
-
- protected override PubKey GetSignerPubKey(int i)
- {
- return SchnorrPubKeys[i].SignerPubKey;
- }
- }
-}

DELETE
WalletWasabi/CoinJoin/Common/Models/InputsRequest.cs
-using NBitcoin;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using WalletWasabi.JsonConverters;
-
-namespace WalletWasabi.CoinJoin.Common.Models
-{
- public class InputsRequest : InputsRequestBase
- {
- [Required, MinLength(1)]
- [JsonProperty(ItemConverterType = typeof(Uint256JsonConverter))]
- public IEnumerable<uint256> BlindedOutputScripts { get; set; }
- }
-}

DELETE
WalletWasabi/CoinJoin/Common/Models/RoundStateResponse.cs
-using System.Collections.Generic;
-using System.Linq;
-using WalletWasabi.CoinJoin.Common.Crypto;
-
-namespace WalletWasabi.CoinJoin.Common.Models
-{
- public class RoundStateResponse : RoundStateResponseBase
- {
- public IEnumerable<SchnorrPubKey> SchnorrPubKeys { get; set; }
-
- public override int MixLevelCount => SchnorrPubKeys.Count();
- }
-}

Remove files accidentally added back by conflict resolving.