balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Edmond Lee 2020-05-26 11:35:19 -07:00
parent 8e2a889b1d
commit 6d6556107a
6 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/examples/cameligo/arithmetic-contract.ligo
View File

@ -16,10 +16,7 @@
entrypoint: add
parameters: 5, 6
generateDeployScript:
<<<<<<< HEAD
tool: tezos-client
=======
>>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01
entrypoint: main
storage: 0
*_*)

3
src/test/examples/pascaligo/arithmetic-contract.ligo
View File

@ -16,10 +16,7 @@
entrypoint: add
parameters: (5, 6)
generateDeployScript:
<<<<<<< HEAD
tool: tezos-client
=======
>>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01
entrypoint: main
storage: 0
*_*)

3
src/test/examples/reasonligo/arithmetic-contract.ligo
View File

@ -16,10 +16,7 @@
entrypoint: add
parameters: (5, 6)
generateDeployScript:
<<<<<<< HEAD
tool: tezos-client
=======
>>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01
entrypoint: main
storage: 0
*_*)

15
tools/webide/packages/client/src/components/configure/generate-deploy-script-pane.tsx
View File

@ -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<AppState, GenerateDeployScriptState['entrypoint']>(
state => state.generateDeployScript.entrypoint
);
=======
const command = useSelector<AppState, GenerateDeployScriptState['command']>(
state => state.generateDeployScript.command
);
const entrypoint = useSelector<AppState, GenerateDeployScriptState['entrypoint']>(
state => state.generateDeployScript.entrypoint
);
>>>>>>> bc2d95d6f6dd4959097e5b6cdb19bce0cc6b3c01:tools/webide/packages/client/src/components/configure/generate-command-pane.tsx
const storage = useSelector<AppState, GenerateDeployScriptState['storage']>(
state => state.generateDeployScript.storage
);

4
tools/webide/packages/client/src/redux/actions/generate-deploy-script.ts
View File

@ -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 \\

24
tools/webide/packages/client/src/redux/generate-deploy-script.ts
View File

@ -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)