conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
/// <reference path="../../typings/tacoUtils.d.ts" />
=======
/// <reference path="../../typings/taco-utils.d.ts" />
/// <reference path="../../typings/taco-kits.d.ts" />
>>>>>>>
/// <reference path="../../typings/tacoUtils.d.ts" />
/// <reference path="../../typings/taco-kits.d.ts" />
<<<<<<<
import templa... |
<<<<<<<
import { parseRpcError, getErrorTypeFromErrorMessage } from '../utils/rpc_errors';
=======
import exponentialBackoff from '../utils/exponential-backoff';
import { parseRpcError } from '../utils/rpc_errors';
>>>>>>>
import exponentialBackoff from '../utils/exponential-backoff';
import { parseRpcError, getErro... |
<<<<<<<
var self = this;
=======
var self: TemplateManager = this;
var templateSrcPath: string = null;
>>>>>>>
var self: TemplateManager = this;
<<<<<<<
return TemplateManager.copyTemplateItemsToProject(cordovaParameters);
=======
/*
... |
<<<<<<<
NearProtocolConfig, LightClientProof, LightClientProofRequest
=======
GenesisConfig, LightClientProof, LightClientProofRequest, GasPrice
>>>>>>>
NearProtocolConfig,
LightClientProof,
LightClientProofRequest,
GasPrice |
<<<<<<<
=======
/// <reference path="typings/del.d.ts" />
/// <reference path="typings/archiver.d.ts" />
>>>>>>>
/// <reference path="typings/del.d.ts" />
/// <reference path="typings/archiver.d.ts" />
<<<<<<<
=======
import archiver = require ("archiver");
import zlib = require ("zlib");
import dtsUtil = requir... |
<<<<<<<
cordovaCli?: string;
templateDisplayName?: string;
isKitProject?: boolean;
kitId?: string;
=======
>>>>>>>
templateDisplayName?: string;
cordovaCli?: string;
isKitProject?: boolean;
kitId?: string;
<<<<<<<
.then(function (): Q.Promise<any> {
return sel... |
<<<<<<<
import resources = require("../resources/resourceManager");
import TacoUtility = require("taco-utils");
=======
import rimraf = require ("rimraf");
import util = require ("util");
import buildMod = require ("../cli/build");
import setupMod = require ("../cli/setup");
import TacoUtility = require ("taco-uti... |
<<<<<<<
this.printCommandTable(list.args, this.indent);
logger.logLine("\n" + this.indent + resources.getString("command.help.usage.options") + "\n", level.NormalBold);
this.printCommandTable(list.options, this.indent + this.indent);
=======
if (list.args) {
this.p... |
<<<<<<<
runCommand(args).then(telemetryProperties => {
telemetryShouldEqual(telemetryProperties, expected);
}).done(() => done(), done);
=======
runCommand(args)
.then(telemetryProperties => telemetryShouldEqual(telemetryProperties, expected))
... |
<<<<<<<
var parsedArgs: IParsedArgs = Taco.parseArgs(process.argv.slice(2));
var commandProperties: ICommandTelemetryProperties = {};
Taco.runWithParsedArgs(parsedArgs)
.then(function (): void {
if (parsedArgs.command) {
parsedArgs.command.ge... |
<<<<<<<
var tacoModules = ["taco-utils", "taco-kits", "taco-dependency-installer", "taco-cli", "remotebuild", "taco-remote", "taco-remote-lib"];
=======
var tacoModules = ["taco-utils", "taco-kits", "taco-cli", "remotebuild", "taco-remote", "taco-remote-lib"];
var allModules = tacoModules.concat(["taco-remote-multipl... |
<<<<<<<
return gulpUtils.copyFiles(
[
"/**/package.json",
"/**/resources.json",
"/**/test/**",
"/**/commands.json",
"/**/TacoKitMetaData.json",
"/**/bin/**",
"/**/templates/**",
"/**/examples/**",
"/*... |
<<<<<<<
// Note not import: We don't want to refer to should_module, but we need the require to occur since it modifies the prototype of Object.
import archiver = require("archiver");
import fs = require("fs");
import mocha = require("mocha");
import os = require("os");
import path = require ("path");
import rimraf = ... |
<<<<<<<
import TacoProjectHelper = projectHelper.TacoProjectHelper;
import telemetry = tacoUtility.Telemetry;
=======
>>>>>>>
import telemetry = tacoUtility.Telemetry;
<<<<<<<
TacoProjectHelper.cdToProjectRoot();
telemetry.init(require("../package.json").version);
=======
projectHelper.cdT... |
<<<<<<<
if (Array.isArray(value)) {
const _remove_count = remove_count;
remove_count = 0;
=======
if (typeof value !== 'object') {
continue;
}
else if (Array.isArray(value)) {
>>>>>>>
if (typeof value !== 'object') {
continue;
}
else if (Array.isArray(value)) {
const _r... |
<<<<<<<
async createMidstreamVersion(id: string, sequence: number, versionLabel: string, updateCursor: string, supportBundleSpec: any, preflightSpec: any, appSpec: any, kotsAppSpec: any, appTitle: string | null, appIcon: string | null): Promise<void> {
const q = `insert into app_version (app_id, sequence, created... |
<<<<<<<
=======
import GitHubApi from "@octokit/rest";
import jwt from "jsonwebtoken";
import { Cluster } from "../cluster";
>>>>>>>
import GitHubApi from "@octokit/rest";
import jwt from "jsonwebtoken";
import { Cluster } from "../cluster"; |
<<<<<<<
extractAppTitleFromTarball,
extractAppIconFromTarball
=======
extractAppTitleFromTarball,
>>>>>>>
extractAppTitleFromTarball,
extractAppIconFromTarball
<<<<<<<
const appIcon = await extractAppIconFromTarball(buffer);
await stores.kotsAppStore.createMidstreamVersion(app.id, newSequence... |
<<<<<<<
extractPreflightSpecFromTarball,
extractSupportBundleSpecFromTarball,
extractAppTitleFromTarball
=======
extractPreflightSpecFromTarball,
extractAppSpecFromTarball,
extractKotsAppSpecFromTarball
>>>>>>>
extractPreflightSpecFromTarball,
extractAppSpecFromTarball,
extractKotsAppSpecFromTarbal... |
<<<<<<<
await request.app.locals.stores.kotsAppStore.createMidstreamVersion(kotsApp.id, 0, cursorAndVersion.versionLabel, cursorAndVersion.cursor, supportBundleSpec, preflightSpec, appSpec, kotsAppSpec, appTitle, appIcon);
=======
await request.app.locals.stores.kotsAppStore.createMidstreamVersion(kotsApp.id,... |
<<<<<<<
export * from './src/findInArray'
=======
export * from './tavern/createTavernName'
export * from './tavern/tavernModifiers'
>>>>>>>
export * from './src/findInArray'
export * from './tavern/createTavernName'
export * from './tavern/tavernModifiers' |
<<<<<<<
import { AR as ARBase, ARAddOptions, ARAddVideoOptions, ARAddBoxOptions, ARAddModelOptions, ARAddSphereOptions, ARAddTextOptions, ARAddTubeOptions, ARDebugLevel, ARFaceTrackingActions, ARImageTrackingActions, ARLoadedEventData, ARNode, ARPlaneDetectedEventData, ARPlaneTappedEventData, ARPosition, ARSceneTappedE... |
<<<<<<<
import { ARUIView } from "./nodes/ios/aruiview";
=======
import { ARGroup } from "./nodes/ios/argroup";
import { ImageSource, fromNativeSource } from "tns-core-modules/image-source";
>>>>>>>
import { ARUIView } from "./nodes/ios/aruiview";
import { ARGroup } from "./nodes/ios/argroup";
import { ImageSource... |
<<<<<<<
import * as application from 'tns-core-modules/application';
import { AR as ARBase, ARAddBoxOptions, ARAddOptions, ARUIViewOptions, ARAddModelOptions, ARAddSphereOptions, ARAddTextOptions, ARAddTubeOptions, ARDebugLevel, ARFaceTrackingActions, ARImageTrackingActions, ARLoadedEventData, ARNode, ARPlaneDetected... |
<<<<<<<
import { getBinPath, getGoRuntimePath } from './goPath';
=======
import { getBinPath, getGoRuntimePath } from './goPath';
import { getCoverage } from './goCover';
if (!getGoRuntimePath()) {
vscode.window.showInformationMessage("No 'go' binary could be found on PATH or in GOROOT.");
}
>>>>>>>
import { getBi... |
<<<<<<<
export type LottiePlayer = {
=======
export type FilterSizeConfig = {
width: string;
height: string;
x: string;
y: string;
};
type LottiePlayer = {
>>>>>>>
export type FilterSizeConfig = {
width: string;
height: string;
x: string;
y: string;
};
export type LottiePlayer = { |
<<<<<<<
/**
* Bi-directional iterator.
*
* {@link Iterator Bidirectional iterators} are iterators that can be used to access the sequence of elements
* in a range in both directions (towards the end and towards the beginning).
*
* All {@link IArrayIterator random-access iterators} are also valid {@link It... |
<<<<<<<
const exchangeContract = await this._getExchangeContractAsync();
let unavailableAmountInBaseUnits = await exchangeContract.getUnavailableValueT.call(orderHashHex);
=======
const exchangeContract = await this.getExchangeContractAsync();
let unavailableAmountInBaseUnits = await e... |
<<<<<<<
import { assetProxyUtils, crypto, orderHashUtils } from '@0xproject/order-utils';
import { AssetProxyId, LogWithDecodedArgs, SignedOrder } from '@0xproject/types';
=======
import { SignedOrder } from '@0xproject/types';
>>>>>>>
import { assetProxyUtils, crypto, orderHashUtils } from '@0xproject/order-utils';... |
<<<<<<<
let missingBaseMinerals = this.getMissingBasicMinerals(reactionQueue, verbose);
=======
const missingBaseMinerals = this.getMissingBasicMinerals(reactionQueue);
>>>>>>>
const missingBaseMinerals = this.getMissingBasicMinerals(reactionQueue);
<<<<<<<
getMissingBasicMinerals(reactionQueue: Re... |
<<<<<<<
import { artifacts as erc1155Artifacts } from '@0x/contracts-erc1155';
import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
import { BatchMatchOrder, LogDecoder, orderUtils, Web3ProviderEngine } from '@0x/contracts-test-utils';
i... |
<<<<<<<
libBytes.publicReadFirst4.callAsync(byteArrayLessThan4Bytes),
RevertReasons.LibBytesGreaterOrEqualTo4LengthRequired,
=======
libBytes.publicReadBytes4.callAsync(byteArrayLessThan4Bytes, new BigNumber(0)),
constants.LIB_BYTES_GREATER_OR_EQUAL_TO_4... |
<<<<<<<
rfqt?: SwapQuoterRfqtOpts;
=======
rfqt?: {
takerApiKeyWhitelist: string[];
makerAssetOfferings: RfqtMakerAssetOfferings;
skipBuyRequests?: boolean;
warningLogger?: LogFunction;
infoLogger?: LogFunction;
};
samplerOverrides?: SamplerOverrides;
>>>>>>>
... |
<<<<<<<
zeroEx.orderStateWatcher.addOrder(signedOrder);
let eventCount = 0;
=======
await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
>>>>>>>
zeroEx.orderStateWatcher.addOrder(signedOrder); |
<<<<<<<
PAYMENT_METHOD_DROPDOWN_OPENED = 'Payment Method - Dropdown Opened',
PAYMENT_METHOD_OPENED_ETHERSCAN = 'Payment Method - Opened Etherscan',
PAYMENT_METHOD_COPIED_ADDRESS = 'Payment Method - Copied Address',
=======
BUY_NOT_ENOUGH_ETH = 'Buy - Not Enough Eth',
BUY_STARTED = 'Buy - Started',... |
<<<<<<<
[markdownSections.introduction]: IntroMarkdownV1,
[markdownSections.installation]: InstallationMarkdownV1,
[markdownSections.schemas]: SchemasMarkdownV1,
[markdownSections.usage]: UsageMarkdownV1,
=======
[docSections.introduction]: IntroMarkdownV1,
... |
<<<<<<<
/**
* Decode the ABI-encoded transaction data into its input arguments
* @param callData The ABI-encoded transaction data
* @returns An array representing the input arguments in order. Keynames of nested structs are preserved.
*/
getABIDecodedTransactionData(
... |
<<<<<<<
import {orderFactory} from './utils/order_factory';
import {FillOrderValidationErrs, Token, SignedOrder} from '../src/types';
=======
import {ExchangeContractErrs, SignedOrder, Token} from '../src/types';
>>>>>>>
import {orderFactory} from './utils/order_factory';
import {Token, SignedOrder, ExchangeContract... |
<<<<<<<
numberOfAssetsAvailable?: number;
=======
affiliateInfo?: AffiliateInfo;
>>>>>>>
numberOfAssetsAvailable?: number;
affiliateInfo?: AffiliateInfo;
<<<<<<<
numberOfAssetsAvailable,
=======
affiliateInfo: state.affiliateInfo,
>>>>>>>
numberOfAssetsAvailable,
a... |
<<<<<<<
import {signedOrdersSchema} from '../schemas/signed_orders_schema';
=======
import {orderFillRequestsSchema} from '../schemas/order_fill_requests_schema';
import {orderCancellationRequestsSchema} from '../schemas/order_cancel_schema';
>>>>>>>
import {signedOrdersSchema} from '../schemas/signed_orders_schema'... |
<<<<<<<
=======
let fillScenarios: FillScenarios;
let coinBase: string;
let makerAddress: string;
>>>>>>>
let coinBase: string;
let makerAddress: string;
<<<<<<<
takerAddress = userAddresses[1];
=======
[coinBase, makerAddress, takerAddress] = userAd... |
<<<<<<<
const callback = (logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
=======
const callback = (err: Error, logEvent: LogEvent<LogFillContractEventArgs>) => {
>>>>>>>
const callback = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {... |
<<<<<<<
Ecosystem = '/ecosystem',
=======
Community = '/community',
Ecosystem = '/eap',
MarketMaker = '/market-maker',
>>>>>>>
Ecosystem = '/eap', |
<<<<<<<
}
// Combinatorial testing types
export enum FeeRecipientAddressScenario {
BurnAddress = 'BURN_ADDRESS',
EthUserAddress = 'ETH_USER_ADDRESS',
}
export enum OrderAssetAmountScenario {
Zero = 'ZERO',
Large = 'LARGE',
Small = 'SMALL',
}
export enum TakerScenario {
CorrectlySpecified = '... |
<<<<<<<
import {constants} from '../src/utils/constants';
import {web3Factory} from './utils/web3_factory';
=======
import {constants} from './utils/constants';
>>>>>>>
import {constants} from './utils/constants';
import {web3Factory} from './utils/web3_factory'; |
<<<<<<<
import { assetProxyUtils, crypto } from '@0xproject/order-utils';
import { AssetProxyId, LogWithDecodedArgs, SignedOrder } from '@0xproject/types';
=======
import { SignedOrder } from '@0xproject/types';
>>>>>>>
import { assetProxyUtils, crypto } from '@0xproject/order-utils';
import { AssetProxyId, SignedOr... |
<<<<<<<
export const HOST_DOMAINS = [
'0x-instant-staging.s3-website-us-east-1.amazonaws.com',
'0x-instant-dogfood.s3-website-us-east-1.amazonaws.com',
'localhost',
'127.0.0.1',
'0.0.0.0',
'unpkg.com',
'jsdelivr.com',
];
export const ROLLBAR_CLIENT_TOKEN = process.env.ROLLBAR_CLIENT_TOKEN;
e... |
<<<<<<<
export type SolidityTypes = keyof typeof SolidityTypes;
export enum ExchangeContractErrs {
ERROR_FILL_EXPIRED, // Order has already expired
ERROR_FILL_NO_VALUE, // Order has already been fully filled or cancelled
ERROR_FILL_TRUNCATION, // Rounding error too large
ERROR_FILL_BALANCE_ALLOWANCE, /... |
<<<<<<<
import { OrderState } from '@0xproject/types';
import { BlockParamLiteral, LogEntryEvent } from 'ethereum-types';
=======
import { LogEntryEvent, OrderState } from '@0xproject/types';
>>>>>>>
import { OrderState } from '@0xproject/types';
import { LogEntryEvent } from 'ethereum-types';
<<<<<<<
* isVerbose:... |
<<<<<<<
transformElement?: (taroElement: TaroElement, element: Element) => TaroElement
},
reconciler: (reconciler: Reconciler<any>) => void
=======
transformElement?: (taroElement: TaroElement, element: Element) => TaroElement,
renderHTMLTag: boolean
}
>>>>>>>
transformElement?: (taroElement: T... |
<<<<<<<
private exchangeContractErrToMsg = {
[ExchangeContractErrs.ERROR_FILL_EXPIRED]: 'The order you attempted to fill is expired',
[ExchangeContractErrs.ERROR_CANCEL_EXPIRED]: 'The order you attempted to cancel is expired',
[ExchangeContractErrs.ERROR_FILL_NO_VALUE]: 'This order has alrea... |
<<<<<<<
SignedOrder,
SubscriptionOpts,
ValidateOrderFillableOpts,
ZeroExError,
=======
EventCallback,
ExchangeContractEventArgs,
DecodedLogArgs,
BlockParamLiteral,
>>>>>>>
EventCallback,
ExchangeContractEventArgs,
DecodedLogArgs,
BlockParamLiteral,
<<<<<<<
... |
<<<<<<<
SwapQuoteConsumerError,
SwapQuoterRfqtOpts,
SignedOrderWithFillableAmounts,
SwapQuoteOrdersBreakdown,
ExchangeProxyContractOpts,
=======
>>>>>>>
<<<<<<<
import { ERC20BridgeSource } from './utils/market_operation_utils/types';
=======
export { affiliateFeeUtils } from './utils/affiliat... |
<<<<<<<
quoteState: AsyncProcessState;
buyOrderState: AsyncProcessState;
=======
quoteRequestState: AsyncProcessState;
>>>>>>>
quoteRequestState: AsyncProcessState;
buyOrderState: AsyncProcessState;
<<<<<<<
quoteState: state.quoteState,
buyOrderState: state.buyOrderState,
=======
q... |
<<<<<<<
UPDATE_SELECTED_ASSET = 'UPDATE_SELECTED_ASSET',
=======
UPDATE_BUY_QUOTE_STATE_PENDING = 'UPDATE_BUY_QUOTE_STATE_PENDING',
UPDATE_BUY_QUOTE_STATE_FAILURE = 'UPDATE_BUY_QUOTE_STATE_FAILURE',
SET_ERROR = 'SET_ERROR',
HIDE_ERROR = 'HIDE_ERROR',
CLEAR_ERROR = 'CLEAR_ERROR',
>>>>>>>
U... |
<<<<<<<
errorFlasher.flashNewErrorMessage(dispatch, errorMessage || 'Error fetching price, please try again');
=======
analytics.trackQuoteError(error.message ? error.message : 'other', baseUnitValue, fetchOrigin);
let errorMessage;
if (error.message ===... |
<<<<<<<
import { ReligionStrength } from './createReligiosity'
import { ProfessionNames, ProfessionSector, ProfessionType } from './professions'
=======
import { LifestyleStandardName } from './lifestyleStandards'
>>>>>>>
import { ReligionStrength } from './createReligiosity'
import { ProfessionNames, ProfessionSect... |
<<<<<<<
import { signatureUtils } from './signature_utils';
import { MessagePrefixType } from './types';
=======
import { ecSignOrderHashAsync } from './signature_utils';
import { CreateOrderOpts } from './types';
>>>>>>>
import { signatureUtils } from './signature_utils';
import { CreateOrderOpts } from './types';
... |
<<<<<<<
import { BuyQuote } from '@0x/asset-buyer';
import * as _ from 'lodash';
import { AffiliateInfo, Network, OrderSource, ProviderState } from '../types';
=======
import { AffiliateInfo, Asset, Network, OrderSource, ProviderState } from '../types';
>>>>>>>
import { BuyQuote } from '@0x/asset-buyer';
import * a... |
<<<<<<<
/**
* Decode the ABI-encoded transaction data into its input arguments
* @param callData The ABI-encoded transaction data
* @returns An array representing the input arguments in order. Keynames of nested structs are preserved.
*/
getABIDecodedTransactionData(c... |
<<<<<<<
import * as _ from 'lodash';
=======
import 'make-promises-safe';
import * as Web3 from 'web3';
>>>>>>>
import 'make-promises-safe'; |
<<<<<<<
* Encode data for multiple assets, per the AssetProxy contract specification.
*/
public encodeMultiAssetData = {
/**
* Sends a read-only call to the contract method. Returns the result that would happen if one were to send an
* Ethereum transaction to this method, given t... |
<<<<<<<
feeOrder = orderFactory.newSignedOrder({
makerAssetData: assetDataUtils.encodeERC20AssetData(zrxToken.address),
=======
feeOrder = await orderFactory.newSignedOrderAsync({
makerAssetData: assetProxyUtils.encodeERC20AssetData(zrxToken.address),
>>>>>>>
feeOrder ... |
<<<<<<<
const zeroExEvent = await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts,
indexFilterValues);
=======
const subscriptionOpts: SubscriptionOpts = {
fromBlock: 0,... |
<<<<<<<
private readonly _methodIds: { [signatureHash: string]: EventAbi } = {};
/**
* Instantiate an AbiDecoder
* @param abiArrays An array of contract ABI's
* @return AbiDecoder instance
*/
=======
private readonly _methodIds: { [signatureHash: string]: { [numIndexedArgs: number]: Ev... |
<<<<<<<
private static throwValidationError(failureReason: FailureReason, tradeSide: TradeSide,
transferType: TransferType): never {
const errMsg = ERR_MSG_MAPPING[failureReason][tradeSide][transferType];
throw new Error(errMsg);
}
constructor(token: T... |
<<<<<<<
const prevProxyAddress = constants.NULL_ADDRESS;
await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
AssetProxyId.ERC20,
erc20Proxy.address,
prevProxyAddress,
{ from: owner },
=======
const prev... |
<<<<<<<
};
zeroEx.orderStateWatcher.subscribe(callback);
=======
});
zeroEx.orderStateWatcher.subscribe(callback, numConfirmations);
>>>>>>>
});
zeroEx.orderStateWatcher.subscribe(callback);
<<<<<<<
};
... |
<<<<<<<
}
export interface TransactionReceipt {
blockHash: string;
blockNumber: number;
transactionHash: string;
transactionIndex: number;
from: string;
to: string;
status: null|0|1;
cumulativeGasUsed: number;
gasUsed: number;
contractAddress: string|null;
logs: Web3.LogEntr... |
<<<<<<<
import * as Web3 from 'web3';
import {ExchangeContractErrs, SignedOrder, Token, ZeroEx, ZeroExError} from '../src';
import {TradeSide, TransferType} from '../src/types';
import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator';
import {OrderValidationUtils} from '../src/utils/order_va... |
<<<<<<<
LiquidityProvider = 'LiquidityProvider',
=======
CurveUsdcDaiUsdtBusd = 'Curve_USDC_DAI_USDT_BUSD',
>>>>>>>
LiquidityProvider = 'LiquidityProvider',
CurveUsdcDaiUsdtBusd = 'Curve_USDC_DAI_USDT_BUSD', |
<<<<<<<
ContractResponse, OrderCancellationRequest, OrderFillRequest,
=======
ContractResponse,
OrderCancellationRequest,
>>>>>>>
ContractResponse,
OrderCancellationRequest,
OrderFillRequest,
<<<<<<<
* Batched version of fillOrderAsync. Executes fills atomically in a single transaction.... |
<<<<<<<
/**
* Decode the ABI-encoded transaction data into its input arguments
* @param callData The ABI-encoded transaction data
* @returns An array representing the input arguments in order. Keynames of nested structs are preserved.
*/
getABIDecodedTransactionData(c... |
<<<<<<<
(logEvent: DecodedLogEvent<WETH9ApprovalEventArgs>) => {
=======
(_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
>>>>>>>
(_logEvent: DecodedLogEvent<WETH9ApprovalEventArgs>) => {
<<<<<<<
(logEvent: DecodedLogEvent<W... |
<<<<<<<
PAYMENT_METHOD_DROPDOWN_OPENED = 'Payment Method - Dropdown Opened',
PAYMENT_METHOD_OPENED_ETHERSCAN = 'Payment Method - Opened Etherscan',
PAYMENT_METHOD_COPIED_ADDRESS = 'Payment Method - Copied Address',
=======
TOKEN_SELECTOR_OPENED = 'Token Selector - Opened',
TOKEN_SELECTOR_CLOSED = ... |
<<<<<<<
const callback = (logEvent: DecodedLogEvent<TransferContractEventArgs>) => {
=======
const callback = (err: Error, logEvent: LogEvent<TransferContractEventArgs>) => {
>>>>>>>
const callback = (err: Error, logEvent: DecodedLogEvent<TransferContractEventArgs>) =>... |
<<<<<<<
export const signatureUtils = {
/**
* Verifies that the provided signature is valid according to the 0x Protocol smart contracts
* @param provider Web3 provider to use for all JSON RPC requests
* @param data The hex encoded data signed by the supplied signature.
* @para... |
<<<<<<<
exchangeV2: '0x080bf510fcbf18b91105470639e9561022937712',
exchange: NULL_ADDRESS,
=======
exchange: NULL_ADDRESS,
>>>>>>>
exchangeV2: '0x080bf510fcbf18b91105470639e9561022937712',
exchange: NULL_ADDRESS,
<<<<<<<
devUtils: '0x92d9a4d50190ae04e03914db2ee650124af... |
<<<<<<<
command: Command;
RegExp: any;
=======
command: typeof Command;
>>>>>>>
command: typeof Command;
RegExp: any; |
<<<<<<<
import {
getSassLoaderOption,
recursiveMerge,
REG_SCRIPTS,
REG_SASS_SASS,
REG_SASS_SCSS,
REG_LESS,
REG_STYLUS,
REG_STYLE,
REG_MEDIA,
REG_FONT,
REG_IMAGE,
REG_VUE
} from '@tarojs/runner-utils'
=======
import { recursiveMerge, REG_SCRIPTS, REG_SASS, REG_LESS, REG_STYLUS, REG_STYLE, REG_M... |
<<<<<<<
import { GetDescriptor } from "../src/transformer/descriptor/descriptor";
=======
import { createFactoryExport } from './helpers';
>>>>>>>
import { createFactoryExport } from './helpers';
import { GetDescriptor } from "../src/transformer/descriptor/descriptor";
<<<<<<<
return GetDescriptor(node.typeArgu... |
<<<<<<<
public static sourceOnly: boolean = false;
=======
forceignore: any;
public constructor() {
if (fs.existsSync(".forceignore")) {
this.forceignore = ignore().add(
fs.readFileSync(".forceignore", "utf8").toString()
);
} else {
this.forceignore = ignore();
}
}
>>>>>... |
<<<<<<<
runtimePath?: string
=======
blended: boolean
>>>>>>>
runtimePath?: string
blended: boolean |
<<<<<<<
function Polygon(points:number[][]) : oc.TopoDS_Shape;
=======
function Polygon(points:Number[][], wire?:Boolean) : oc.TopoDS_Shape;
/** Creates a bspline from a list of 3-component lists (points).
* This can be converted into an edge -> wire -> face via the respective BRepBuilderAPI functions.
* Or used d... |
<<<<<<<
=======
import lab from '../labs/lab-slice'
import incident from '../incidents/incident-slice'
import incidents from '../incidents/incidents-slice'
import labs from '../labs/labs-slice'
import breadcrumbs from '../breadcrumbs/breadcrumbs-slice'
import components from '../components/component-slice'
>>>>>>> |
<<<<<<<
getScrollPositions, getMaxDate, getMinDate, getScrollbarWidth
=======
getScrollPositions, getMaxDate, getMinDate, coerceDate
>>>>>>>
getScrollPositions, getMaxDate, getMinDate, getScrollbarWidth, coerceDate
<<<<<<<
updateGridHeaderWidth(this);
=======
this.chartRowDateToX = functio... |
<<<<<<<
addListenerDependencies(this.vLineOptions);
=======
addListenerDependencies();
if (this.vEvents && typeof this.vEvents.afterLineDraw === 'function') {
this.vEvents.afterLineDraw();
}
>>>>>>>
addListenerDependencies(this.vLineOptions);
if (this.vEvents && typeof thi... |
<<<<<<<
updateGridHeaderWidth(this);
=======
if (this.vEvents && this.vEvents.afterDraw) {
this.vEvents.afterDraw()
}
>>>>>>>
updateGridHeaderWidth(this);
if (this.vEvents && this.vEvents.afterDraw) {
this.vEvents.afterDraw()
} |
<<<<<<<
public async query(sql: string, params?: any[]|{}, options?:SqlQueryOptions): Promise<any[]> {
=======
async query(sql: string, params?: any[], options?:SqlQueryOptions): Promise<any[]>
async query(sql: string, params?: Object, options?:SqlQueryOptions): Promise<any[]>
async query(sql: string,... |
<<<<<<<
// Listen for files upload
ipcMain.on('database-file-submission', (event, filePaths: any) => {
console.log('file paths sent from renderer', filePaths);
splashWindow.close();
});
=======
>>>>>>> |
<<<<<<<
const { exec } = require("child_process");
const db = require('./modal');
=======
const { exec } = require('child_process');
const appMenu = require('./mainMenu');
>>>>>>>
const { exec } = require("child_process");
const appMenu = require('./mainMenu');
const db = require('./modal');
<<<<<<<
=======
... |
<<<<<<<
// conditional to get the correct schemaFilePath name from the Load Schema Modal
if (!data.schemaFilePath) {
=======
if (!data.schemaFilePath) {
>>>>>>>
// conditional to get the correct schemaFilePath name from the Load Schema Modal
if (!data.schemaFilePath) {
<<<<<<<
=======
console.log(... |
<<<<<<<
}
export function isEmpty(str: any): boolean {
return (!str || '' === str);
}
export function isNotEmpty(str: any): boolean {
return <boolean>(str && '' !== str);
=======
}
// One-time use timer for performance testing
export class Timer {
private _startTime: number[];
private _endTime: num... |
<<<<<<<
this.registerCommand(Constants.cmdCreateProfile);
this._event.on(Constants.cmdCreateProfile, () => { self.onCreateProfile(); });
this.registerCommand(Constants.cmdRemoveProfile);
this._event.on(Constants.cmdRemoveProfile, () => { self.onRemoveProfile(); });
=======
this... |
<<<<<<<
import { LanguageClient, LanguageClientOptions, ServerOptions,
TransportKind, RequestType, NotificationType, INotificationHandler } from 'vscode-languageclient';
=======
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
import * as Utils from '../... |
<<<<<<<
export { BumperService } from "https://raw.githubusercontent.com/drashland/services/master/ci/bumper_service.ts";
export { green, red } from "https://deno.land/std@0.74.0/fmt/colors.ts";
=======
export { green, red } from "https://deno.land/std@0.75.0/fmt/colors.ts";
>>>>>>>
export { BumperService } from "h... |
<<<<<<<
);
Rhum.asserts.assertEquals(await response.text(), '{"name":"Medium"}');
// TODO(crookse) application/x-www-form-urlencoded works, but this test
// keeps failing. Fix.
// data = { id: 18 };
// response = await members.fetch.get("http://localhost:3000/coffee/19/?location=fro... |
<<<<<<<
export const version = "v1.2.4";
=======
export const version: string = "v1.2.5";
>>>>>>>
export const version = "v1.2.5"; |
<<<<<<<
export { green, red } from "https://deno.land/std@0.73.0/fmt/colors.ts";
export { IndexService } from "../services/index/index_service.ts";
=======
export { green, red } from "https://deno.land/std@0.74.0/fmt/colors.ts";
>>>>>>>
export { green, red } from "https://deno.land/std@0.74.0/fmt/colors.ts";
expor... |
<<<<<<<
import { Point, LineChartOptions } from '@t/options';
=======
import { LineSeriesOptions } from '@t/options';
>>>>>>>
import { LineChartOptions, LineSeriesOptions } from '@t/options';
<<<<<<<
const pointOnColumn = options.xAxis?.pointOnColumn || true;
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.