From 6d6556107aabf54e3cdaeead3eb91e469fab796a Mon Sep 17 00:00:00 2001 From: Edmond Lee Date: Tue, 26 May 2020 11:35:19 -0700 Subject: [PATCH] fix merge conflict --- .../cameligo/arithmetic-contract.ligo | 3 --- .../pascaligo/arithmetic-contract.ligo | 3 --- .../reasonligo/arithmetic-contract.ligo | 3 --- .../configure/generate-deploy-script-pane.tsx | 15 ------------ .../redux/actions/generate-deploy-script.ts | 4 ---- .../src/redux/generate-deploy-script.ts | 24 ------------------- 6 files changed, 52 deletions(-) diff --git a/src/test/examples/cameligo/arithmetic-contract.ligo b/src/test/examples/cameligo/arithmetic-contract.ligo index 242b8cc9b..74f2b147c 100644 --- a/src/test/examples/cameligo/arithmetic-contract.ligo +++ b/src/test/examples/cameligo/arithmetic-contract.ligo @@ -16,10 +16,7 @@ entrypoint: add parameters: 5, 6 generateDeployScript: -<<<<<<< HEAD tool: tezos-client -======= ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01 entrypoint: main storage: 0 *_*) diff --git a/src/test/examples/pascaligo/arithmetic-contract.ligo b/src/test/examples/pascaligo/arithmetic-contract.ligo index f15c0863d..604267653 100644 --- a/src/test/examples/pascaligo/arithmetic-contract.ligo +++ b/src/test/examples/pascaligo/arithmetic-contract.ligo @@ -16,10 +16,7 @@ entrypoint: add parameters: (5, 6) generateDeployScript: -<<<<<<< HEAD tool: tezos-client -======= ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01 entrypoint: main storage: 0 *_*) diff --git a/src/test/examples/reasonligo/arithmetic-contract.ligo b/src/test/examples/reasonligo/arithmetic-contract.ligo index 332843348..8690d992c 100644 --- a/src/test/examples/reasonligo/arithmetic-contract.ligo +++ b/src/test/examples/reasonligo/arithmetic-contract.ligo @@ -16,10 +16,7 @@ entrypoint: add parameters: (5, 6) generateDeployScript: -<<<<<<< HEAD tool: tezos-client -======= ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01 entrypoint: main storage: 0 *_*) diff --git a/tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx b/tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx index 0b4021288..72017a142 100644 --- a/tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx +++ b/tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx @@ -9,11 +9,7 @@ import { ChangeToolAction, GenerateDeployScriptState, } from '../../redux/generate-deploy-script'; -<<<<<<< HEAD:tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx import { Tool } from '../../redux/types'; -======= -import { Tool, ToolCommand } from '../../redux/types'; ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/components/configure/generate-command-pane.tsx import { AccessFunctionLabel, Group, Input, Label, Textarea } from '../form/inputs'; import { Option, Select } from '../form/select'; @@ -28,21 +24,10 @@ export const GenerateDeployScriptPane = () => { state => state.generateDeployScript.tool ); -<<<<<<< HEAD:tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx const entrypoint = useSelector( state => state.generateDeployScript.entrypoint ); -======= - const command = useSelector( - state => state.generateDeployScript.command - ); - - const entrypoint = useSelector( - state => state.generateDeployScript.entrypoint - ); - ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/components/configure/generate-command-pane.tsx const storage = useSelector( state => state.generateDeployScript.storage ); diff --git a/tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts b/tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts index 352e28531..69ec2884e 100644 --- a/tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts +++ b/tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts @@ -82,11 +82,7 @@ export class GenerateDeployScriptAction extends CancellableAction { const title = slugify(editor.title).toLowerCase() || 'untitled'; const output = `tezos-client \\ -<<<<<<< HEAD:tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts originate \\ -======= - ${generateDeployScript.command} \\ ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/redux/actions/generate-command.ts contract \\ ${title} \\ transferring 0 \\ diff --git a/tools/webide/packages/client/src/redux/generate-deploy-script.ts b/tools/webide/packages/client/src/redux/generate-deploy-script.ts index 425712c23..d5d4d6f94 100644 --- a/tools/webide/packages/client/src/redux/generate-deploy-script.ts +++ b/tools/webide/packages/client/src/redux/generate-deploy-script.ts @@ -1,16 +1,8 @@ import { ActionType as ExamplesActionType, ChangeSelectedAction as ChangeSelectedExampleAction } from './examples'; -<<<<<<< HEAD:tools/webide/packages/client/src/redux/generate-deploy-script.ts import { Tool } from './types'; export enum ActionType { ChangeTool = 'generate-deploy-script-change-tool', -======= -import { Tool, ToolCommand } from './types'; - -export enum ActionType { - ChangeTool = 'generate-deploy-script-change-tool', - ChangeCommand = 'generate-deploy-script-change-command', ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/redux/generate-command.ts ChangeEntrypoint = 'generate-deploy-script-change-entrypoint', ChangeStorage = 'generate-deploy-script-change-storage' } @@ -26,14 +18,6 @@ export interface GenerateDeployScriptState { export class ChangeToolAction { public readonly type = ActionType.ChangeTool; constructor(public payload: GenerateDeployScriptState['tool']) {} -<<<<<<< HEAD:tools/webide/packages/client/src/redux/generate-deploy-script.ts -======= -} - -export class ChangeCommandAction { - public readonly type = ActionType.ChangeCommand; - constructor(public payload: GenerateDeployScriptState['command']) {} ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/redux/generate-command.ts } export class ChangeEntrypointAction { @@ -66,14 +50,6 @@ export default ( ): GenerateDeployScriptState => { switch (action.type) { case ExamplesActionType.ChangeSelected: -<<<<<<< HEAD:tools/webide/packages/client/src/redux/generate-deploy-script.ts -======= - return { - ...state, - ...(!action.payload ? DEFAULT_STATE : action.payload.generateDeployScript) - }; - case ActionType.ChangeTool: ->>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/redux/generate-command.ts return { ...state, ...(!action.payload ? DEFAULT_STATE : action.payload.generateDeployScript)