conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using SIM.Extensions;
namespace SIM.Instances
=======
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using SIM.Extensions;
namespace SIM.Instances
>>>>>>>
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using SIM.Extensions;
namespace SIM... |
<<<<<<<
/// <summary>
/// Provides information about the current programme environment.
/// </summary>
public class EnvironmentInfo : IEnvironmentInfo
{
#region Properties
=======
using System;
using System.IO;
using System.Windows.Forms;
using Microsoft.Win32;
using S... |
<<<<<<<
using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework;
=======
using System.Globalization;
>>>>>>>
using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework;
using System.Globalization; |
<<<<<<<
new ApplicationViewInfo(Name.ARPTable, new PackIconMaterial() { Kind = PackIconMaterialKind.Matrix}),
=======
new ApplicationViewInfo(Name.WakeOnLAN, new PackIconMaterial() { Kind = PackIconMaterialKind.Power }),
new ApplicationViewInfo(Name.SubnetCa... |
<<<<<<<
public FormBaseAirCorps fBaseAirCorps;
=======
public FormJson fJson;
>>>>>>>
public FormBaseAirCorps fBaseAirCorps;
public FormJson fJson;
<<<<<<<
SubForms.Add( fBaseAirCorps = new FormBaseAirCorps( this ) );
=======
SubForms.Add( fJson = new FormJson( this ) );
>>>>>>>
SubForms.Add( fB... |
<<<<<<<
this.UI_BarColorMorphing = new System.Windows.Forms.CheckBox();
=======
this.FormFleet_BarColorMorphing = new System.Windows.Forms.CheckBox();
>>>>>>>
this.UI_BarColorMorphing = new System.Windows.Forms.CheckBox();
<<<<<<<
=======
this.Life_CanCloseFloatWindowInLock = new System.Windows.Forms.... |
<<<<<<<
private const int HASH_SIZE = 32;
/// <summary> Default number of threads to use </summary>
private const int DEFAULT_THREADS = 1;
=======
public const int HASH_SIZE = 32;
>>>>>>>
public const int HASH_SIZE = 32;
/// <summary> Default number of threads to use </summ... |
<<<<<<<
using Stratis.Bitcoin.Base;
=======
using NBitcoin;
using Stratis.Bitcoin.BlockPulling;
>>>>>>>
using Stratis.Bitcoin.Base;
<<<<<<<
services.AddSingleton<CoinView, CachedCoinView>();
=======
services.AddSingleton<ICoinView, CachedCoinView>();
ser... |
<<<<<<<
using Stratis.Bitcoin.Base;
=======
using NBitcoin.Rules;
>>>>>>>
using NBitcoin.Rules;
using Stratis.Bitcoin.Base;
<<<<<<<
private Mock<IRuleRegistration> ruleRegistration;
public TestPosConsensusRules(Network network, ILoggerFactory loggerFactory, IDateTimeProvider dateTimeProvider, Concu... |
<<<<<<<
private readonly CoinView coinView;
=======
private readonly LookaheadBlockPuller blockPuller;
private readonly ICoinView coinView;
>>>>>>>
private readonly ICoinView coinView;
<<<<<<<
=======
private readonly StakeChainStore stakeChain;
private readonly I... |
<<<<<<<
this.consensusLoop = new Mock<IConsensusManager>();
this.network = Network.StratisTest;
=======
this.consensusLoop = new Mock<IConsensusLoop>();
this.network = KnownNetworks.StratisTest;
>>>>>>>
this.consensusLoop = new Mock<IConsensusManager>();
... |
<<<<<<<
: base(consensusManager, dateTimeProvider, loggerFactory, mempool, mempoolLock, network)
=======
: base(consensusLoop, dateTimeProvider, loggerFactory, mempool, mempoolLock, minerSettings, network)
>>>>>>>
: base(consensusManager, dateTimeProvider, loggerFactory, mempool, ... |
<<<<<<<
=======
using NBitcoin.Rules;
using Stratis.Bitcoin.Utilities;
>>>>>>>
using NBitcoin.Rules; |
<<<<<<<
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c45... |
<<<<<<<
this.signals.Verify(s => s.SignalBlock(It.IsAny<Block>()), Times.Exactly(0));
=======
var notification = new BlockNotification(this.LoggerFactory.Object, chain, new Mock<ILookaheadBlockPuller>().Object, signals.Object, new AsyncLoopFactory(new LoggerFactory()), lifetime);
n... |
<<<<<<<
scriptPubKey = new Script(new[] { Op.GetPushOp(hex), OpcodeType.OP_CHECKSIG });
newBlock = new BlockTemplate();
entry = new TestMemPoolEntryHelper();
chain = new ConcurrentChain(network);
network.Consensus.Options = new PowConsensusOptions();
cachedCoinView = new CachedCoinView(new InMe... |
<<<<<<<
: base(consensusManager, dateTimeProvider, loggerFactory, mempool, mempoolLock, network, new BlockDefinitionOptions() { IsProofOfStake = false })
=======
: base(consensusLoop, dateTimeProvider, loggerFactory, mempool, mempoolLock, minerSettings, network)
>>>>>>>
: base(con... |
<<<<<<<
public WalletManager(ILoggerFactory loggerFactory, IConnectionManager connectionManager, Network network, ConcurrentChain chain,
NodeSettings settings, DataFolder dataFolder, IWalletFeePolicy walletFeePolicy, MempoolValidator mempoolValidator = null) // mempool does not exist in a light wall... |
<<<<<<<
protected Mock<IBlockPuller> lookaheadBlockPuller;
protected Mock<CoinView> coinView;
=======
protected Mock<ILookaheadBlockPuller> lookaheadBlockPuller;
protected Mock<ICoinView> coinView;
>>>>>>>
protected Mock<IBlockPuller> lookaheadBlockPuller;
protected Mo... |
<<<<<<<
this.network.Consensus.Options = new ConsensusOptions();
=======
this.network.Consensus.Options = new ConsensusOptions();
this.network.Consensus.Rules = new SmartContractRuleRegistration().GetRules();
>>>>>>>
this.network.Consensus.Options = ne... |
<<<<<<<
PowBlockDefinition blockDefinition = CreatePowBlockAssembler(consensus, consensusRules, dateTimeProvider, loggerFactory as LoggerFactory, mempool, mempoolLock, network);
=======
PowBlockDefinition blockDefinition = new PowBlockDefinition(consensusLoop, dateTimeProvider, loggerFactory, ... |
<<<<<<<
using NBitcoin.Protocol;
using Stratis.Bitcoin.Common.JsonErrors;
=======
>>>>>>>
using NBitcoin.Protocol;
<<<<<<<
=======
using Xunit;
using System.Collections.Generic;
using NBitcoin.Protocol;
using System.Security;
using Stratis.Bitcoin.Tests.Logging;
using System.Linq;
>>>>>>>
<<<<<<<
using Stratis.... |
<<<<<<<
using Stratis.Bitcoin.Consensus;
using Stratis.Bitcoin.Features.Consensus;
=======
>>>>>>>
using Stratis.Bitcoin.Consensus; |
<<<<<<<
public TestPosConsensusRules(Network network, ILoggerFactory loggerFactory, IDateTimeProvider dateTimeProvider, ConcurrentChain chain, NodeDeployments nodeDeployments, ConsensusSettings consensusSettings, ICheckpoints checkpoints, CoinView uxtoSet, IStakeChain stakeChain, IStakeValidator stakeValidator,... |
<<<<<<<
return client.HttpClient.RequestWithoutHandlersAsync(HttpMethod.Post, MobileServiceAuthentication.LoginAsyncUriFragment + "/" + this.ProviderName, this.client.CurrentUser, token.ToString());
=======
string path = MobileServiceUrlBuilder.CombinePaths(MobileServiceAuthentication.LoginAsy... |
<<<<<<<
ApiCop.RegisterRule(new UnusedFeatureApiCopRule("UserControlLogic.InfoBarMessageControl", "The InfoBarMessageControl is never found. This can have a negative impact on performance. Consider setting the SkipSearchingForInfoBarMessageControl or DefaultSkipSearchingForInfoBarMessageControlValue to true... |
<<<<<<<
if (!string.IsNullOrEmpty(dataErrorInfo[modelProperty]))
{
SetFieldValidationResult(FieldValidationResult.CreateError(mapping.ViewModelProperty, dataErrorInfo[modelProperty]));
=======
validationContext.AddFiel... |
<<<<<<<
Person person = new Person();
person.LastName = "last_name";
=======
var person = new Person();
person.LastName = "last name";
>>>>>>>
var person = new Person();
person.LastName = "last_name"; |
<<<<<<<
using ViewModels;
=======
using Services;
>>>>>>>
using ViewModels;
using Services;
<<<<<<<
var modelPropertyPropertyInfo = modelPropertyType.GetPropertyEx(valueProperty);
if (modelPropertyPropertyInfo == null)
=======
Log.Warning... |
<<<<<<<
public int SentBubbleColor { get; set; }
public int ReceivedBubbleColor { get; set; }
public int SentFontColor { get; set; }
public int ReceivedFontColor { get; set; }
public bool BubbleColorsChosen { get; set; }
=======
public bool BackgroundChosen { get; set; }... |
<<<<<<<
UnreadIndicatorGuid = null,
LastUnreadSetTime = 0,
ParticipantNicknames = null,
RingtoneDisabled = false,
VibrateOptionDisabled = false,
SentBubbleColor = 0,
ReceivedBubbleColor = 0,
... |
<<<<<<<
public static string QuotedAddressThemselves
{
get
{
return "&^%$#@?!themselves!?@#$%^&";
}
}
=======
public static string NonSignedChannel
{
get
{
return "&^%$#@?!nonSignedChannel!?@#$%^&";
}
}
>>>>>>>
p... |
<<<<<<<
//string value = quantity.GetStandardizedValue(); // for better scientific precision comparisons.
=======
>>>>>>>
<<<<<<<
{ "value", q.GetValueAsBson() },
=======
{ "value", new BsonDouble((double)q.Value) },
... |
<<<<<<<
public static class InfrastructureExtensions
{
public static Infrastructure AddLocalhost(this Infrastructure infrastructure, ILocalhost localhost)
{
infrastructure.Localhost = localhost;
return infrastructure;
}
public static Infrastructu... |
<<<<<<<
using AccessibilityInsights.SharedUx.FileBug;
using AccessibilityInsights.SharedUx.Highlighting;
=======
using AccessibilityInsights.SharedUx.FileIssue;
>>>>>>>
using AccessibilityInsights.SharedUx.Highlighting;
using AccessibilityInsights.SharedUx.FileIssue; |
<<<<<<<
using Microsoft.TeamFoundation.SourceControl.WebApi;
=======
>>>>>>>
using WebApi = Microsoft.TeamFoundation.SourceControl.WebApi;
<<<<<<<
using System.Text;
=======
>>>>>>>
<<<<<<<
var refNames = new Dictionary<Sha1Id, List<string>>();
var oldCommits = new HashSet<Sha1Id... |
<<<<<<<
private const string EmptyPartitionId = "::empty";
=======
private readonly InMemoryPersistenceOptions _options;
>>>>>>>
private readonly InMemoryPersistenceOptions _options;
private const string EmptyPartitionId = "::empty"; |
<<<<<<<
public const string QueryDir = "QueryDir";
=======
public const string QueryInfo = "QueryInfo";
>>>>>>>
public const string QueryDir = "QueryDir";
public const string QueryInfo = "QueryInfo"; |
<<<<<<<
public const string CalliphoraPartial = "Png/CalliphoraPartial.png";
=======
public const string Rgb48BppInterlaced = "Png/rgb-48bpp-interlaced.png";
>>>>>>>
public const string CalliphoraPartial = "Png/CalliphoraPartial.png";
public const string Rgb48BppInterl... |
<<<<<<<
[Theory]
[WithTestPatternImages(100, 100, PixelTypes.Rgba32)]
public void CanSaveIndexedPng<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : struct, IPixel<TPixel>
{
// does saving a file then repoening mean both files are identical???
... |
<<<<<<<
using System.IO;
using System.Text;
using Xunit;
using ImageSharp.Formats;
using ImageSharp.PixelFormats;
=======
>>>>>>>
<<<<<<<
[Theory]
[InlineData(TestImages.Png.Bpp1, 1)]
[InlineData(TestImages.Png.Gray4Bpp, 4)]
[InlineData(TestImages.Png.Palette8B... |
<<<<<<<
using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
=======
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
>>>>>>>
using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
<<... |
<<<<<<<
using ImageSharp.Formats.Jpeg.GolangPort.Utils;
using Xunit;
using Xunit.Abstractions;
=======
>>>>>>> |
<<<<<<<
public static Image Load(Configuration configuration, Stream stream, IImageDecoder decoder) =>
WithSeekableStream(configuration, stream, true, s => decoder.Decode(configuration, s));
=======
public static Image Load(Configuration configuration, Stream stream, IImageDecoder decoder)... |
<<<<<<<
/// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
/// <param name="count">The code lengths</param>
=======
/// <param name="memoryAllocator">The <see cref="MemoryAllocator"/> to use for buffer allocations.</param>
/// <param ... |
<<<<<<<
IndicatorRelease = 131,
//Chart Operations
ChartId = 206,
ChartRedraw = 207,
ChartApplyTemplate = 236,
ChartSaveTemplate = 237,
ChartWindowFind = 238,
ChartTimePriceToXY = 239,
ChartXYToTimePrice = 240,
ChartOp... |
<<<<<<<
Guard.NotNull(color, nameof(color));
var xyzColor = this.ToCieXyz(color);
=======
CieXyz xyzColor = this.ToCieXyz(color);
>>>>>>>
var xyzColor = this.ToCieXyz(color);
<<<<<<<
Guard.NotNull(color, nameof(color));
var xyzColor = this.T... |
<<<<<<<
Guard.NotNull(color, nameof(color));
var xyzColor = this.ToCieXyz(color);
=======
CieXyz xyzColor = this.ToCieXyz(color);
>>>>>>>
var xyzColor = this.ToCieXyz(color);
<<<<<<<
Guard.NotNull(color, nameof(color));
var xyzColor = this.T... |
<<<<<<<
// ReSharper disable InconsistentNaming
namespace ImageSharp.Tests
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
using ImageSharp.PixelFormats;
using Xunit;
using Xunit.Abstractions;
==... |
<<<<<<<
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
=======
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLabColorSapce;
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementati... |
<<<<<<<
Rectangle bounds)
where TPaletteDitherImageProcessor : struct, IPaletteDitherImageProcessor<TPixel>
where TPixel : struct, IPixel<TPixel>
=======
Rectangle bounds,
float scale)
where TPixel : unmanaged, IPixel<TPixel>
>>>>>>>
... |
<<<<<<<
using SixLabors.ImageSharp.Helpers;
=======
using System.Text;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory;
>>>>>>>
using SixLabors.ImageSharp.Helpers;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory;
<<<<<<<
public struct AppliedOperation
===... |
<<<<<<<
// Copyright (c) Six Labors and contributors.
// Licensed under the GNU Affero General Public License, Version 3.
=======
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
>>>>>>>
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. |
<<<<<<<
=======
/// <summary>
/// Queues up a simple operation that provides access to the mutatable image.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="source">The image to rotate, flip, or both.</param>
/// <param name="o... |
<<<<<<<
// Copyright (c) Six Labors and contributors.
// Licensed under the GNU Affero General Public License, Version 3.
=======
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
>>>>>>>
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. |
<<<<<<<
/// <summary>
/// Perform a multi mapping query with arbitrary input parameters
/// </summary>
/// <typeparam name="TReturn">The return type</typeparam>
/// <param name="cnn"></param>
/// <param name="sql"></param>
/// <param name="types">array of types in... |
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
{
image
.Ba... |
<<<<<<<
public void SaveTestOutputFile<TPixel>(
Image<TPixel> image,
string extension = null,
IImageEncoder encoder = null,
IEncoderOptions options = null,
object settings = null)
=======
public void SaveTestOutputFile<TPixel>(Image<TPixel> i... |
<<<<<<<
class IntDynamicParam : Dapper.SqlMapper.IDynamicParameters
{
IEnumerable<int> numbers;
public IntDynamicParam(IEnumerable<int> numbers)
{
this.numbers = numbers;
}
public void AddParameters(IDbCommand command)
... |
<<<<<<<
// Copyright (c) Six Labors and contributors.
// Licensed under the GNU Affero General Public License, Version 3.
=======
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
>>>>>>>
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. |
<<<<<<<
trie.Serialize(fileName);
}//);
=======
trie.Serialize(fileNameTemplate);
});
>>>>>>>
trie.Serialize(fileName);
}); |
<<<<<<<
}
if (isDbString && item as DbString != null)
{
var str = item as DbString;
str.AddParameter(command, listParam.ParameterName);
}
else
{
... |
<<<<<<<
/// <summary>
/// Perform a multi mapping query with arbitrary input parameters
/// </summary>
/// <typeparam name="TReturn">The return type</typeparam>
/// <param name="cnn"></param>
/// <param name="sql"></param>
/// <param name="types">array of types in... |
<<<<<<<
var payload = new PayloadData(preparer.ParseAndBindParameters());
await Session.SendAsync(payload, cancellationToken).ConfigureAwait(false);
reader = await MySqlDataReader.CreateAsync(this, behavior, cancellationToken).ConfigureAwait(false);
=======
preparer.BindParameters();
var payload =... |
<<<<<<<
Reset();
await ReadResultSetHeaderAsync(cancellationToken).ConfigureAwait(false);
=======
await ReadResultSetHeader(cancellationToken).ConfigureAwait(false);
>>>>>>>
await ReadResultSetHeaderAsync(cancellationToken).ConfigureAwait(false); |
<<<<<<<
/// <typeparam name="T">The type of the observable value.</typeparam>
=======
>>>>>>>
/// <typeparam name="T">The type of the observable value.</typeparam> |
<<<<<<<
Mode = mode;
OpenCommand = ReactiveCommand.Create(NavigateToSelf);
=======
OpenCommand = ReactiveCommand.Create(
() =>
{
NavigateToSelf();
});
>>>>>>>
Mode = mode;
OpenCommand = ReactiveCommand.Create(
() =>
{
NavigateToSelf();
}); |
<<<<<<<
=======
GhostscriptVersionInfo _lastInstalledVersion = null;
>>>>>>>
private GhostscriptVersionInfo _lastInstalledVersion = null; |
<<<<<<<
public NavBarViewModel(NavigationStateViewModel navigationState, RoutingState router, WalletManagerViewModel walletManager)
=======
public NavBarViewModel(IScreen screen, RoutingState router, WalletManagerViewModel walletManager, AddWalletPageViewModel addWalletPage)
>>>>>>>
public NavBarViewModel(Navi... |
<<<<<<<
using System.Collections.Generic;
using NBitcoin;
=======
using Avalonia.Controls;
using NBitcoin;
>>>>>>>
using Avalonia.Controls;
using System.Collections.Generic;
using NBitcoin;
<<<<<<<
private SortOrder _statusSortDirection;
private SortOrder _privacySortDirection;
private SortOrder _amountSor... |
<<<<<<<
_running = 0;
BitcoinStore = bitcoinStore;
WasabiClientFactory = wasabiClientFactory;
WasabiClient = wasabiClientFactory.NewBackendClient();
=======
_running = StateNotStarted;
>>>>>>>
_running = StateNotStarted;
BitcoinStore = bitcoinStore;
WasabiClientFactory = wasabiClientFactory;
... |
<<<<<<<
using WalletWasabi.Fluent.ViewModels.Wallets.Actions;
=======
using WalletWasabi.Fluent.ViewModels.Wallets.HardwareWallet;
using WalletWasabi.Fluent.ViewModels.Wallets.WatchOnlyWallet;
>>>>>>>
using WalletWasabi.Fluent.ViewModels.Wallets.Actions;
using WalletWasabi.Fluent.ViewModels.Wallets.HardwareWallet;
u... |
<<<<<<<
public TransactionInfoTabViewModel(TransactionDetailsViewModel transaction) : base(string.Empty)
=======
public TransactionInfoTabViewModel(TransactionInfo transaction) : base("")
>>>>>>>
public TransactionInfoTabViewModel(TransactionDetailsViewModel transaction) : base("") |
<<<<<<<
BackendApiHttpClient = new BackendHttpClient(new ClearnetHttpClient(regTestFixture.HttpClient, () => RegTestFixture.BackendEndPointApiUri));
=======
BackendHttpClient = new ClearnetHttpClient(() => RegTestFixture.BackendEndPointUri);
BackendApiHttpClient = new ClearnetHttpClient(() => RegTestFixture.... |
<<<<<<<
}).StartShellApp("Wasabi Wallet", new DefaultLayoutFactory());
=======
Logger.SetFilePath(Path.Combine(Global.DataDir, "Logs.txt"));
#if RELEASE
Logger.SetMinimumLevel(LogLevel.Info);
Logger.SetModes(LogMode.File);
#else
Logger.SetMinimumLevel(LogLevel.Debug);
Logger.SetModes(LogMode.De... |
<<<<<<<
private readonly TimeSpan _reasonableCoreShutdownTimeout = TimeSpan.FromSeconds(21);
=======
private readonly TimeSpan ReasonableCoreShutdownTimeout = TimeSpan.FromSeconds(30);
>>>>>>>
private readonly TimeSpan _reasonableCoreShutdownTimeout = TimeSpan.FromSeconds(30); |
<<<<<<<
private readonly ReadOnlyObservableCollection<SearchItemViewModel> _searchItems;
private NavBarItemViewModel _selectedItem;
=======
private NavBarItemViewModel? _selectedItem;
>>>>>>>
private readonly ReadOnlyObservableCollection<SearchItemViewModel> _searchItems;
private NavBarItemViewModel? _sele... |
<<<<<<<
[JsonConstructor]
public SmartTransaction(Transaction transaction, Height height, uint256 blockHash = null, int blockIndex = 0, Label label = null, DateTimeOffset? firstSeenIfMempoolTime = null, bool isReplacement = false)
=======
public SmartTransaction(Transaction transaction, Height height, uint256 b... |
<<<<<<<
// It does not need to be accessed with a thread safe fasion with Interlocked through IsRunning, this may have some performance benefit
=======
// It doesn't need to be accessed with a thread safe fashion with Interlocked through IsRunning, this may have some performance benefit
>>>>>>>
... |
<<<<<<<
Global.BitcoinStore.SmartHeaderChain
.WhenAnyValue(x => x.TipHeight)
.Throttle(TimeSpan.FromMilliseconds(100))
.Select(x => new Height(x))
.Merge(Model.WhenAnyValue(x => x.Height))
=======
Global.BitcoinStore.HashChain
.WhenAnyValue(x => x.TipHeight).Select(_ => Unit.Default)
.Me... |
<<<<<<<
using WalletWasabi.Fluent.ViewModels.Dialogs.CreateWallet;
=======
using WalletWasabi.Gui.Validation;
using WalletWasabi.Models;
using Avalonia;
using Avalonia.Markup.Xaml.Styling;
>>>>>>>
using WalletWasabi.Gui.Validation;
using WalletWasabi.Models;
using Avalonia;
using Avalonia.Markup.Xaml.Styling;
using ... |
<<<<<<<
await IoHelpers.TryDeleteDirectoryAsync(dir);
await txStore.InitializeAsync(dir, Network.RegTest);
=======
await IoHelpers.DeleteRecursivelyWithMagicDustAsync(dir);
var txStore = new AllTransactionStore(dir, Network.RegTest);
await txStore.InitializeAsync();
>>>>>>>
await IoHelpers.TryDelet... |
<<<<<<<
var res = await pb.SendCommandAsync("enumerate", openConsole: false, cts.Token);
=======
var res = await pb.SendCommandAsync("version", false, cts.Token);
>>>>>>>
var res = await pb.SendCommandAsync("version", openConsole: false, cts.Token);
<<<<<<<
var res = await pb.SendCommandAsync("enumerat... |
<<<<<<<
TerminateService = new TerminateService(TerminateApplicationAsync);
CrashReporter = new CrashReporter();
=======
>>>>>>>
TerminateService = new TerminateService(TerminateApplicationAsync);
<<<<<<<
=======
if (runGui)
{
CrashReporter.SetException(ex);
}
>>>>>>>
<<<<<<<
//... |
<<<<<<<
public void Draw(SpriteBatch spriteBatch, Rectangle visibleRectangle, bool useMapBackgroundColor = false)
=======
public TiledObjectGroup GetObjectGroup(string name)
{
return _objectGroups.FirstOrDefault(i => i.Name == name);
}
public void Draw(SpriteBatch ... |
<<<<<<<
/// <summary>
/// Creates new <see cref="TorHttpClient"/>.
/// </summary>
public TorHttpClient NewBackendTorHttpClient(bool isolateStream)
{
return new TorHttpClient(BackendUriGetter, TorEndpoint, isolateStream);
}
=======
/// <summary>
/// Creates new <see cref="TorHttpClient"/> or <see c... |
<<<<<<<
OpenDialogCommand = ReactiveCommand.CreateFromTask(async () => await ConfirmSetting.Handle("Please confirm the setting:").ToTask());
ConfirmSetting = new Interaction<string, bool>();
ConfirmSetting.RegisterHandler(
async interaction =>
{
var x = new TestDialogViewModel(interaction.Input... |
<<<<<<<
public EnterPasswordViewModel(NavigationStateViewModel navigationState, NavigationTarget navigationTarget) : base(navigationState, navigationTarget)
=======
public EnterPasswordViewModel(
string subtitle)
>>>>>>>
public EnterPasswordViewModel(NavigationStateViewModel navigationState, NavigationTarge... |
<<<<<<<
/// <inheritdoc/>
public WasabiClient(Func<Uri> baseUriAction, EndPoint? torSocks5EndPoint) : base(baseUriAction, torSocks5EndPoint)
=======
private volatile bool _disposedValue = false; // To detect redundant calls
public WasabiClient(Func<Uri> baseUriAction, EndPoint torSocks5EndPoint)
>>>>>>>
p... |
<<<<<<<
private int _anonymitySet = int.MaxValue;
=======
private Cluster _cluster;
>>>>>>>
private Cluster _cluster;
private int _anonymitySet = int.MaxValue;
<<<<<<<
public int AnonymitySet
{
get => _anonymitySet;
set => RaiseAndSetIfChanged(ref _anonymitySet, value);
}
=======
public C... |
<<<<<<<
using WalletWasabi.Coins;
using WalletWasabi.Transactions;
=======
using WalletWasabi.Blockchain.TransactionOutputs;
>>>>>>>
using WalletWasabi.Blockchain.TransactionOutputs;
using WalletWasabi.Transactions; |
<<<<<<<
// When we invalidate a block, those transactions set in the invalidated block
// are reintroduced when we generate a new block through the rpc call
operations = new[]{
new WalletService.Operation(scp, Money.Coins(0.013m), "") };
=======
// When we invalidate a block, the transactions set... |
<<<<<<<
IsBusy = true;
=======
var wallet = walletViewModelBase.Wallet;
>>>>>>>
var wallet = walletViewModelBase.Wallet;
<<<<<<<
ForgotPasswordCommand = ReactiveCommand.Create(() =>
Navigate(NavigationTarget.DialogScreen).To(new PasswordFinderIntroduceViewModel(wallet)));
=======
Enable... |
<<<<<<<
Interlocked.Exchange(ref _throttleId, 0); // So to notified the currently throttled threads that they do not have to run.
=======
Interlocked.Exchange(ref _throttleId, 0); // So to notify the currently throttled threads that they don't have to run.
>>>>>>>
Interlocked.Exchange(ref _throttleId,... |
<<<<<<<
_transactionInfo.ConfirmationTimeSpan = CalculateConfirmationTime(x);
=======
SetXAxisCurrentValueIndex(x);
>>>>>>>
_transactionInfo.ConfirmationTimeSpan = CalculateConfirmationTime(x);
SetXAxisCurrentValueIndex(x);
<<<<<<<
public ICommand PasteCommand { get; }
public double XAx... |
<<<<<<<
public SettingsPageViewModel(NavigationStateViewModel navigationState, Global global) : base(navigationState, NavigationTarget.HomeScreen)
=======
private Global Global;
public SettingsPageViewModel(NavigationStateViewModel navigationState) : base(navigationState)
>>>>>>>
public SettingsPageViewMode... |
<<<<<<<
private Global _global;
private NavigationStateViewModel _navigationState;
=======
private readonly Global _global;
>>>>>>>
private readonly Global _global;
<<<<<<<
private DialogScreenViewModel _dialogScreen;
private DialogViewModelBase _currentDialog;
=======
private DialogViewModelBase? _... |
<<<<<<<
public static SmartTransaction ExtractSmartTransaction(this PSBT psbt, Height height, uint256 blockHash = null, int blockIndex = 0, Label label = null, DateTimeOffset? firstSeenIfMempoolTime = null, bool isReplacement = false)
=======
public static SmartTransaction ExtractSmartTransaction(this PSBT psbt, ... |
<<<<<<<
#nullable enable
using Avalonia.Threading;
=======
>>>>>>>
#nullable enable
using Avalonia.Threading;
<<<<<<<
using System.Reactive.Linq;
using System.Text;
using System.Threading.Tasks;
=======
>>>>>>>
using System.Reactive.Linq;
using System.Text;
using System.Threading.Tasks;
<<<<<<<
public class Ma... |
<<<<<<<
// Because we want to tolerate http:// and https:// in the host we also want to make sure it does not contradict the schame
=======
// Because we want to tolerate http:// and https:// in the host we also want to make sure it doesn't contradict the scheme
>>>>>>>
// Because we want to tolerate http:/... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.