conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System.Drawing;
=======
using System;
using System.IO;
using System.Threading.Tasks;
using WaveEngine.Common.Math;
>>>>>>>
using System.IO;
using System.Threading.Tasks;
using WaveEngine.Common.Math;
<<<<<<<
=======
protected float canvasWidth;
protected float canvasHeight;
... |
<<<<<<<
// The pass "SRPDefaultUnlit" is a fallback to legacy unlit rendering and is required to support unity 2d + unity UI that render in the scene.
=======
static CustomSampler[] m_samplers = new CustomSampler[(int)CustomSamplerId.Max];
// The pass "SRPDefaultUnlit" is a fall back to legac... |
<<<<<<<
async Task ConnectAndLogIn()
{
await Client.ConnectAsync();
await Client.LoginAsync(Username, Password);
}
Client.Disconnected += async (e, args) =>
{
Console.WriteLine($"Disconnected from Soulseek serv... |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Microsoft.Reliability", "CA2002:DoNotLockOnObjectsWithWeakIdentity", Scope = "member", Target = "~M:HarmonyLib.HarmonySharedState.GetState~System.Collections.Generic.Dictionary{System.Reflection.MethodBase,System.Byte[]}")]
[assembly: SuppressM... |
<<<<<<<
[Ignore("Skip failed test")]
[Test]
public void Traverse_Missing_Method()
{
var instance = new TraverseMethods_Instance();
var trv = Traverse.Create(instance);
string methodSig1 = "";
try
{
trv.Method("FooBar", new object[] { "hello", 123 });
}
catch (MissingMethodException e)
... |
<<<<<<<
if (type == typeof(object)) return default;
=======
#pragma warning restore RECS0017
if (type == typeof(object)) return default(T);
>>>>>>>
#pragma warning restore RECS0017
if (type == typeof(object)) return default; |
<<<<<<<
public override void CheckUrl(Uri url, Cookie[] cookies)
{
if (cookies.Length == 0)
return;
var cookie = cookies.FirstOrDefault(x => x.Name.IndexOf("oauth_code", StringComparison.CurrentCultureIgnoreCase) == 0);
if (!string.IsNullOrWhiteSpace(cookie?.Value))
FoundAuthCode(cookie.Value);
... |
<<<<<<<
string levelID = level.LevelID();
var apkTxn = new Apk.Transaction();
if (existingLevels.Contains(levelID)) {
if (removeSongs)
{
... |
<<<<<<<
public LevelCollectionBehaviorData FindCustomLevelCollection()
{
var col = FindScript<LevelCollectionBehaviorData>(mb => mb.name == "CustomLevelCollection", l => true);
if (col == null)
{
var ptr = AppendAsset(new MonoBehaviorAssetData()
... |
<<<<<<<
internal static AcmeDirectory AcmeDir = new AcmeDirectory
=======
private static Uri[] StagingServers = new[]
{
new Uri("http://localhost:4000/directory"),
WellKnownServers.LetsEncryptStaging
};
internal static Directory AcmeDir = new ... |
<<<<<<<
=======
}
>>>>>>>
<<<<<<<
constants["instanceCount"] = m_InstanceCountField.value;
=======
constants["instanceCount"] = m_InstanceCountField.value;
var progressIncrement = (progressEnd - progressStart) / m_InstanceCountField.value;
>>>>>>>
co... |
<<<<<<<
using LetsEncrypt.ACME.Simple.Services;
using Microsoft.Web.Administration;
using System.Linq;
using static LetsEncrypt.ACME.Simple.Services.InputService;
namespace LetsEncrypt.ACME.Simple.Plugins.TargetPlugins
{
class IISSite : IISPlugin, ITargetPlugin
{
string IHasName.Name
{
... |
<<<<<<<
private readonly DomainParseService _domainParser;
private readonly Uri _resourceManagerEndpoint;
=======
>>>>>>>
private readonly Uri _resourceManagerEndpoint;
<<<<<<<
ISettingsService settings): base(dnsClient, log, settings)
=======
ISettingsService setti... |
<<<<<<<
// Advanced services
_client = Container.Resolve<LetsEncryptClient>();
_certificateService = new CertificateService(_options, _log, _client, _settings.ConfigPath);
_renewalService = new RenewalService(_settings, _input, _clientName, _settings.ConfigPath);
... |
<<<<<<<
using Windows.Storage;
using Windows.UI.Core;
=======
using Windows.Storage;
>>>>>>>
using Windows.Storage;
using Windows.UI.Core;
<<<<<<<
if (ApplicationData.Current.LocalSettings.Values.ContainsKey("SendCloudClipboard"))
{
if (bool.TryParse(ApplicationData.Current.L... |
<<<<<<<
=======
public string ToStepString()
{
return generator.AttributeStepString(this);
}
public string Assignment()
{
return generator.AttributeDataAssignment(this);
}
public string Allocation(){
return generator.AttributeDataAllocation(this);
}
>>>>>>>
public string ToStepString()... |
<<<<<<<
修改标识：Senparc - 20170122
修改描述：v4.12.2 修复HttpUtility.UrlEncode方法错误
----------------------------------------------------------*/
=======
修改标识：Senparc - 20170730
修改描述：v4.13.3 为RequestUtility.HttpGet()方法添加Accept、UserAgent、KeepAlive设置
-------------------------------------------------------------... |
<<<<<<<
=======
using System.Web;
using Senparc.Weixin.Helpers.StringHelper;
>>>>>>>
using Senparc.Weixin.Helpers.StringHelper; |
<<<<<<<
修改标识：Senparc - 20170213
修改描述：v14.3.123 修复微信支付 "TotalFee" 类型错误[decimal→int]
=======
修改标识：Senparc - 20170211
修改描述：v14.3.125 重新调整sign_type设置顺序，v14.3.122版本中不应该做调整
>>>>>>>
修改标识：Senparc - 20170211
修改描述：v14.3.125 重新调整sign_type设置顺序，v14.3.122版本中不应该做调整
修改标识：Senparc - 20170213
修改描述：v1... |
<<<<<<<
linker.Link(LinkType.AbsoluteAddress, PatchType.I4, SectionKind.Text, MethodName, pos, symbol, referenceOffset);
=======
// Otherwise create the symbol in the expected section
if (symbol == null)
{
symbol = linker.GetSymbol(symbolOperand.Name, section);
}
linker.Link(LinkType.Abs... |
<<<<<<<
文件名：ResponseHandler.cs
文件功能描述：微信支付V3 响应处理
创建标识：Senparc - 20150211
修改标识：Senparc - 20150303
修改描述：整理接口
修改标识：Senparc - 20161015
修改描述：修改GB2312编码为936
=======
文件名：ResponseHandler.cs
文件功能描述：微信支付 响应处理
创建标识：Senparc - 20150722
修改标识：Senparc - 20170623
修改描述：使用 ASCII 字典排序
... |
<<<<<<<
修改标识：Senparc - 20170617
修改描述：v4.12.3 提供对企业微信的支持：添加WorkJsonResult（企业微信返回消息基类）、ReturnCode_Work（枚举）
=======
修改标识：Senparc - 20170328
修改描述：v4.12.1 添加【ReturnCode.小程序Appid不存在】枚举类型（invalid weapp appid，40166）
>>>>>>>
修改标识：Senparc - 20170328
修改描述：v4.12.1 添加【ReturnCode.小程序Appid不存在】枚举类型（i... |
<<<<<<<
/// <summary>
/// Constructs a finger.
///
/// Generally, you should not create your own finger objects. Such objects will not
/// have valid tracking data. Get valid finger objects from a hand in a frame
/// received from the service.
/// @since 3.0
/// </summary>
=======
... |
<<<<<<<
TestAngleCode();
=======
Debug.Log("Eulers: " + FreezeX + " " + FreezeY + " " + FreezeZ + " " + startingEulers + " " + targetEulers + " " + transform.localEulerAngles);
>>>>>>>
TestAngleCode();
Debug.Log("Eulers: " + FreezeX + " " + FreezeY + " " + FreezeZ + " " + startingEulers + " " + targe... |
<<<<<<<
/// <summary>
/// Constructs a new Frame.
/// @since 3.0
/// </summary>
public Frame(long id, long timestamp, float fps, InteractionBox interactionBox, List<Hand> hands) {
=======
/**
* Constructs a new Frame.
*
* @param id The id of this frame.
* @param timestamp T... |
<<<<<<<
/// <summary>
/// If this Maybe has a value, returns the value, otherwise returns the argument
/// custom default value.
/// </summary>
public T ValueOr(T customDefault) {
if (hasValue) {
return _t;
}
else {
return customDefault;
}
}
/// <summ... |
<<<<<<<
/// <summary>
/// Variable to keep track of previous button text incase the button text changes after registration.
/// </summary>
private string prevButtonText;
=======
/// <summary>
/// The final keyword that is registered with the Keyword Manager
... |
<<<<<<<
=======
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "2.7";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPriv... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
using Xceed.Wpf.Toolkit.Core.Utilities;
>>>>>>>
using Xceed.Wpf.Toolkit.Core.Utilities;
using System.Collections.Generic;
using System.Linq; |
<<<<<<<
public Type HasAttribute { get; set; }
=======
private IList _targetProperties;
#endregion
#region PropertyDefinitions
public PropertyDefinitionCollection PropertyDefinitions
{
get
{
return _propertyDefinitions;
}
set
{
this.ThrowIfLock... |
<<<<<<<
using System.ComponentModel;
=======
using Xceed.Wpf.DataGrid.Views;
>>>>>>>
using Xceed.Wpf.DataGrid.Views;
using System.ComponentModel; |
<<<<<<<
using System.Collections.Specialized;
=======
using System.Collections.ObjectModel;
>>>>>>>
using System.Collections.ObjectModel;
using System.Collections.Specialized;
<<<<<<<
using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
=======
>>>>>>>
using Xceed.Wpf... |
<<<<<<<
=======
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "2.5";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPriv... |
<<<<<<<
using System.Windows.Automation.Peers;
=======
using System.ComponentModel;
>>>>>>>
using System.ComponentModel;
using System.Windows.Automation.Peers; |
<<<<<<<
_logger = LogManager.GetLogger(nameof(BlockExecutor));
=======
>>>>>>>
<<<<<<<
Rollback(block, txnRes).ConfigureAwait(false);
=======
// TODO, no wait may need improve
Rollback(block, txnRes).ConfigureAwait(false);
>>>>>>>
// TO... |
<<<<<<<
await Task.Yield();
if (cancellationToken.IsCancellationRequested && isCancellable)
=======
if (isCancellable && cancellationToken.IsCancellationRequested)
>>>>>>>
await Task.Yield();
if (isCancellable && cancellationToken.IsCancellationRequested)
... |
<<<<<<<
_smartContractManager = smartContractManager;
=======
_accountManager = accountManager;
_smartContractService = smartContractManager;
>>>>>>>
_smartContractService = smartContractManager;
<<<<<<<
var smartContract = await _smartContractManager.GetA... |
<<<<<<<
await Task.Yield();
// if (cancellationToken.IsCancellationRequested && isCancellable)
// {
// return new TransactionTrace
// {
// TransactionId = transaction.GetHash(),
// ExecutionStatus = ExecutionStatus.Can... |
<<<<<<<
using AElf.Kernel.Storages;
using AElf.TestBase;
=======
>>>>>>>
using AElf.Kernel.Storages;
using AElf.TestBase;
<<<<<<<
private IStateStore _stateStore;
=======
private IChainContextService _chainContextService;
private IChainService _chainService;
private ITransactionMan... |
<<<<<<<
typeof(MinerAElfModule),
typeof(CrosschainAElfModule),
=======
typeof(AElf.Miner.MinerAElfModule),
typeof(ConsensusKernelAElfModule),
typeof(AElf.Miner.Rpc.MinerRpcAElfModule),
>>>>>>>
typeof(AElf.Miner.MinerAElfModule),
typeof(ConsensusKernelAElfModule... |
<<<<<<<
var contractAddress = GenesisContractHash(chainId);
await _smartContractService.DeployContractAsync(chainId, contractAddress, smartContractRegistration);
=======
var contractAddress = new Hash(chainId.CalculateHashWith("__SmartContractZero__")).ToAccount();
... |
<<<<<<<
var graph = graphObject.graph as UnityEngine.MaterialGraph.MaterialGraph;
=======
var graph = inMemoryAsset as IShaderGraph;
>>>>>>>
var graph = graphObject.graph as IShaderGraph; |
<<<<<<<
public void SendVirtualInline(Hash fromVirtualAddress, Address toAddress, string methodName,
params object[] args)
{
TransactionContext.Trace.InlineTransactions.Add(new Transaction()
{
From = ConvertVirtualAddressToContractAddress(fromVirtualAd... |
<<<<<<<
=======
_logger?.Trace($"Valid block {block.BlockHashToHex}.");
>>>>>>> |
<<<<<<<
using AElf.Miner.TxMemPool;
using AElf.SmartContract;
=======
>>>>>>>
using AElf.Miner.TxMemPool;
<<<<<<<
private readonly ITxPool _txPool;
=======
private readonly IStateStore _stateStore;
private readonly ITxPoolService _txPoolService;
>>>>>>>
private readonly ITxPool _t... |
<<<<<<<
if (block.Header.Height == KernelConstants.GenesisBlockHeight)
=======
if (block.Height == Constants.GenesisBlockHeight)
>>>>>>>
if (block.Header.Height == Constants.GenesisBlockHeight)
<<<<<<<
await _crossChainDataProvider.GetIndexedCrossChainBlockDataAsy... |
<<<<<<<
using AElf.OS.BlockSync.Infrastructure;
using AElf.OS.Network;
=======
>>>>>>>
using AElf.OS.Network;
<<<<<<<
private readonly IBlockSyncStateProvider _blockSyncStateProvider;
private readonly ITaskQueueManager _taskQueueManager;
private readonly IBlockSyncAttachService _blockSyncAtt... |
<<<<<<<
builder.RegisterModule(new DatabaseModule());
builder.RegisterModule(new LoggerModule());
=======
builder.RegisterModule(new DatabaseModule(new DatabaseConfig()));
>>>>>>>
builder.RegisterModule(new LoggerModule());
builder.RegisterModule(new Databa... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading;
using AElf.Common;
using AElf.Cryptography.ECDSA;
using AElf.Execution.Execution;
using Google.Protobuf;
using Xunit;
namespace AElf.Kernel.Tests
{
public class BlockChain... |
<<<<<<<
private const string GetDeserializedInfo = "get_deserialized_info";
=======
private const string CallReadOnly = "call";
>>>>>>>
private const string GetDeserializedInfo = "get_deserialized_info";
private const string CallReadOnly = "call";
<<<<<<<
... |
<<<<<<<
ValidateContractState(State.ParliamentAuthContract, State.ParliamentAuthContractSystemName.Value);
Address organizationAddress = State.ParliamentAuthContract.GetZeroOwnerAddress.Call(new Empty());
=======
ValidateContractState(State.ParliamentAuthContract, SmartContractCons... |
<<<<<<<
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.FeeCalculation;
=======
using AElf.Kernel.FeeCalculation;
using AElf.Kernel.FeeCalculation.Application;
>>>>>>>
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.FeeCalculation;
using AElf.Kernel.FeeCalculation.Application;
<<<<<<<
usin... |
<<<<<<<
Logger.LogTrace($"Pushed {block}, current state {CurrentState}, current head {HeadBlock}");
=======
_logger?.Trace($"Pushed {block}, current state {CurrentState}, current head {HeadBlock}, blockset head {_blockSet.CurrentHead.BlockHash}");
>>>>>>>
Logger.LogTra... |
<<<<<<<
State.CurrentMiners.Value = minersKeys.ToList().ToMiners();
=======
State.TermNumberFromMainChainField.Value = consensusInformation.Round.TermNumber;
State.CurrentMiners.Value = minersKeys.ToMiners(1);
>>>>>>>
State.TermNumberFromMainChainField.Value = consensu... |
<<<<<<<
using System.Security.Cryptography;
using System.Text;
using System.Threading;
=======
>>>>>>>
using System.Security.Cryptography;
using System.Text;
using System.Threading;
<<<<<<<
using AElf.Synchronization.EventMessages;
using Base58Check;
=======
using AElf.Synchronization.EventMessages;
>>>>>>>
usin... |
<<<<<<<
private void OnExit(object sender, ConsoleCancelEventArgs args)
=======
private void OnCancelKeyPress(object sender, EventArgs args)
>>>>>>>
private void OnCancelKeyPress(object sender, EventArgs args)
<<<<<<<
Logger.Trace("node will be shut down after 5s...");... |
<<<<<<<
var handshake = await _handshakeProvider.GetHandshakeAsync();
var client = CreateClient(ipAddress);
=======
var client = CreateClient(endpoint);
var connectionInfo = await _connectionInfoProvider.GetConnectionInfoAsync();
ConnectReply co... |
<<<<<<<
public override AddressList GetDeployedContractAddressList(Empty input)
{
return State.DeployedContractAddressList.Value;
}
=======
public override Empty ValidateSystemContractAddress(ValidateSystemContractAddressInput input)
{
var actualAddress... |
<<<<<<<
=======
// TODO: Recover test cases of cross chain extra data provider.
/*
>>>>>>>
<<<<<<<
var crossChainBlockExtraDataProvider =
new CrossChainBlockExtraDataProvider(fakeTransactionResultGettingService);
await crossChainBlockExtraDataProvider.FillExt... |
<<<<<<<
using AElf.Contracts.MultiToken.Messages;
=======
using AElf.Contracts.MultiToken;
>>>>>>>
using AElf.Contracts.MultiToken;
using AElf.Contracts.MultiToken.Messages; |
<<<<<<<
#region Authorization
public const string AElfMultiSig = "__MultiSig__";
#endregion
#region PoTC
public static ulong ExpectedTransactionCount = 8000;
#endregion
#region Single node test
public static int SingleNodeTestMiningInterval = 4000;
... |
<<<<<<<
private async Task<bool> ValidateCrossChainBlockDataAsync(CrossChainBlockData crossChainBlockData, Hash sideChainTransactionsRoot,
Hash preBlockHash, ulong preBlockHeight)
=======
private async Task<bool> ValidateCrossChainBlockDataAsync(CrossChainBlockData crossChainBlockData,
... |
<<<<<<<
using AElf.Kernel.Managers;
=======
>>>>>>>
using AElf.Kernel.Managers; |
<<<<<<<
ChainConfig.Instance.ChainId = chainId.DumpHex();
_contract = new SideChainContractShim(Mock, ContractHelpers.GetCrossChainContractAddress(chainId));
=======
ChainConfig.Instance.ChainId = chainId.DumpBase58();
_contract = new SideChainContractShim(Mock, Contrac... |
<<<<<<<
Task<List<TransactionTrace>> ExecuteAsync(List<Transaction> transactions, Hash chainId, CancellationToken cancellationToken, Hash disambiguationHash = null, TransactionType transactionType = TransactionType.ContractTransaction, bool skipFee=false);
=======
Task<List<TransactionTrace>> ExecuteA... |
<<<<<<<
public class SecretSharingInformationLogEventProcessor : IBlocksExecutionSucceededLogEventProcessor
=======
internal class SecretSharingInformationLogEventProcessor : LogEventProcessorBase, IBestChainFoundLogEventProcessor
>>>>>>>
internal class SecretSharingInformationLogEventProcessor : LogEven... |
<<<<<<<
_transactionResultManager, clientManager, _binaryMerkleTreeManager, null,
MockBlockValidationService().Object, _chainContextService, _chainManager, _stateManager);
=======
_transactionResultManager, _logger, clientManager, _binaryMerkleTreeManager, null,
... |
<<<<<<<
using AElf.Contracts.CrossChain;
=======
using Acs0;
using AElf.Contracts.MultiToken.Messages;
>>>>>>>
using Acs0; |
<<<<<<<
"Cg5tZXNzYWdlcy5wcm90byJ7CgtUcmFuc2FjdGlvbhITCgRGcm9tGAEgASgL",
"MgUuSGFzaBIRCgJUbxgCIAEoCzIFLkhhc2gSEwoLSW5jcmVtZW50SWQYAyAB",
"KAQSEgoKTWV0aG9kTmFtZRgEIAEoCRIOCgZQYXJhbXMYBSABKAwSCwoDRmVl",
"GAYgASgEIhUKBEhhc2gSDQoFVmFsdWUYASABKAwiaQoLQmxvY2tIZWFkZXIS",
... |
<<<<<<<
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
=======
using Vote;
>>>>>>>
using Vote;
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes; |
<<<<<<<
using Acs4;
=======
using AElf.Contracts.Consensus.DPoS;
>>>>>>>
using Acs4;
using AElf.Contracts.Consensus.DPoS;
<<<<<<<
=======
using AElf.Kernel.Consensus.AElfConsensus.Application;
>>>>>>>
using AElf.Kernel.Consensus.AElfConsensus.Application; |
<<<<<<<
context.Services.AddSingleton<ICrossChainDataProvider, CrossChainDataProvider>();
context.Services
.AddSingleton<ITransactionValidationProvider, ConstrainedCrossChainTransactionValidationProvider>();
=======
context.Services.AddTransient<ISmartContractAddres... |
<<<<<<<
using Google.Protobuf;
=======
using AElf.Kernel.Types;
>>>>>>>
using AElf.Kernel.Types;
using Google.Protobuf; |
<<<<<<<
private readonly IBlockchainStateManager _blockchainStateManager;
=======
private readonly IAccountService _accountService;
private const float RatioMine = 0.3f;
>>>>>>>
private readonly IBlockchainStateManager _blockchainStateManager;
private readonly IAccountService... |
<<<<<<<
public const int AnnouncementQueueJobTimeout = 1000;
public const int TransactionQueueJobTimeout = 1000;
public const int LibAnnouncementQueueJobTimeout = 1000;
=======
>>>>>>>
<<<<<<<
public const string LibAnnouncementBroadcastQueueName = "LibAnnouncemen... |
<<<<<<<
private IAuthorizationInfo _authorizationInfo;
=======
private IStateStore _stateStore;
>>>>>>>
private IAuthorizationInfo _authorizationInfo;
private IStateStore _stateStore;
<<<<<<<
_authorizationInfo = new AuthorizationInfo(StateStore);
=======
_s... |
<<<<<<<
using AElf.Kernel.SmartContractExecution;
using AElf.Kernel.SmartContractExecution.Execution;
using AElf.Kernel.SmartContractExecution.Scheduling;
using AElf.Kernel.Infrastructure;
using AElf.Kernel.SmartContractExecution.Application;
using AElf.Kernel.Tests.Concurrency.Execution;
using AElf.Miner;
using AElf.M... |
<<<<<<<
#region PoTC
public static ulong ExpectedTransactionCount = 8000;
#endregion
#region Single node test
public static int SingleNodeTestMiningInterval = 4000;
#endregion
public static ulong BasicContractZeroSerialNumber = 100;
=======
public ... |
<<<<<<<
/*
=======
public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
{
var extraDataOrderInformation = context.ServiceProvider.GetService<BlockExtraDataOrderService>();
var blockExtraDataProviders = context.ServiceProvider.Get... |
<<<<<<<
using System.Text;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading;
=======
>>>>>>>
using System.Threading;
<<<<<<<
public void SleepMilliseconds(int milliSeconds)
{
// Used to test timeout
Thread.Sleep(milliS... |
<<<<<<<
// We need at least check the txs count of this block.
var chainContext = await _chainContextService.GetChainContextAsync(Hash.LoadHex(ChainConfig.Instance.ChainId));
=======
// validate block before appending
var chainContext = await _chainConte... |
<<<<<<<
//TODO: Add test cases for deployment permission
=======
[Fact]
public async Task Update_SmartContract_Without_Owner()
{
var contractAddress = await Deploy_SmartContracts();
var result = await AnotherTester.UpdateSmartContract.SendAsync(
... |
<<<<<<<
=======
context.Services
.AddSingleton<ITransactionSizeFeeUnitPriceProvider, DefaultTransactionSizeFeeUnitPriceProvider>();
context.Services.AddSingleton<ITransactionExecutingService, PlainTransactionExecutingService>();
context.Services.AddSingleton<IPlainT... |
<<<<<<<
using AElf.Synchronization.BlockSynchronization;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.DependencyInjection;
=======
>>>>>>>
using AElf.Synchronization.BlockSynchronization;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abs... |
<<<<<<<
using AElf.Standards.ACS2;
=======
using Acs2;
using AElf.ContractTestKit;
using AElf.Kernel.Blockchain;
using AElf.Kernel.Blockchain.Events;
>>>>>>>
using AElf.Standards.ACS2;
using AElf.ContractTestKit;
using AElf.Kernel.Blockchain;
using AElf.Kernel.Blockchain.Events; |
<<<<<<<
=======
using AElf.Kernel.Blockchain.Domain;
using AElf.Kernel.Blockchain.Infrastructure;
>>>>>>>
<<<<<<<
// private async Task<bool> ValidateCrossChainLogEventInBlock(LogEvent interestedLogEvent, IBlock block)
// {
// foreach (var txId in block.Body.Transactions)
// {
//... |
<<<<<<<
using AElf.Contracts.TestKit;
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.Consensus.Application;
=======
using AElf.ContractTestKit;
>>>>>>>
using AElf.ContractTestKit;
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.Consensus.Application; |
<<<<<<<
var tx = await GenerateTransaction(CrossChainContractAddress, "RequestChainCreation", null,
=======
var tx = GenerateTransaction(CrossChainContractAddress, CrossChainConsts.RequestChainCreationMethodName, null,
>>>>>>>
var tx = await GenerateTransaction(CrossChainContractA... |
<<<<<<<
//_logger?.Trace("Transaction insertion failed:{0}, [{1}]", res, tx.GetTransactionInfo());
//await _poolService.RemoveAsync(tx.GetHash());
=======
_logger?.Trace("Transaction insertion failed:{0}, [{1}]", res, tx.GetTransactionInfo());
// await _poolService.Remo... |
<<<<<<<
public AElfDPoSInformation DpoSInformation { get; private set; }
=======
private DataProvider DataProvider
{
get
{
var dp = DataProvider.GetRootDataProvider(_chainId, _contractAddressHash);
dp.StateStore = _stateStore;
... |
<<<<<<<
public ILocalEventBus EventBus { get; set; }
=======
public IReadOnlyDictionary<long, Hash> RecentBlockHeightAndHashMappings { get; }
private readonly ConcurrentDictionary<long, Hash> _recentBlockHeightAndHashMappings;
>>>>>>>
public ILocalEventBus EventBus { get; set; }
... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
=======
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
>>>>>>>
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
... |
<<<<<<<
public static GUIContent transparentDepthPrepassEnableText = new GUIContent("Enable transparent depth prepass", "It allow to ");
public static GUIContent enableFogText = new GUIContent("Enable Fog");
=======
public static GUIContent transparentDepthPrepassEnableText = new ... |
<<<<<<<
Logger.LogDebug($"Trigger sync blocks from peers, lib height: {chain.LastIrreversibleBlockHeight}, lib block hash: {blockHash}");
=======
var blockHeight = chain.LastIrreversibleBlockHeight;
>>>>>>>
Logger.LogDebug($"Trigger sync blocks from peers, lib height: ... |
<<<<<<<
=======
private readonly ILogger _logger;
private IBlockChain _blockChain;
private readonly ClientManager _clientManager;
>>>>>>>
<<<<<<<
private ECKeyPair _keyPair;
=======
private readonly IChainManagerBasic _chainManagerBasic;
private readonly DPoSInfoPro... |
<<<<<<<
=======
using System;
using AElf.Kernel.TransactionPool.Infrastructure;
using AElf.OS;
>>>>>>>
<<<<<<<
services.AddApplication<WebAppTestAElfModule>();
=======
services.AddApplication<WebAppTestAElfModule>(options => { options.UseAutofac(); });
services.AddSingleton<ITx... |
<<<<<<<
if (block.Height != Constants.GenesisBlockHeight &&
block.Header.Time.ToDateTime() - DateTime.UtcNow > KernelConsts.AllowedFutureBlockTimeSpan)
=======
if (block.Height != KernelConstants.GenesisBlockHeight &&
block.Header.Time.ToDateTime() - DateTime.Ut... |
<<<<<<<
new SmartContractService(SmartContractManager, _smartContractRunnerContainer, stateStore,
functionMetadataService, _chainService);
=======
new SmartContractService(SmartContractManager, _smartContractRunnerContainer, _stateManager,
functi... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
using AElf.Contracts.TestKit;
using AElf.Kernel;
>>>>>>>
using AElf.Contracts.TestKit;
<<<<<<<
SchemeId = schemeId,
BeneficiaryShare = new BeneficiaryShare {Beneficiary = Address.Generate(), Shares = shares}
=======
ProfitId = profitId,
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.