refactor compile function

pull/5370/head
Joseph Izang 1 year ago committed by Aniket
parent 444ebe8d65
commit 6fff91dbe6
  1. 18
      apps/vyper/src/app/utils/compiler.tsx

@ -181,15 +181,11 @@ export async function compileContract(contract: string, compilerUrl: string, set
try { try {
_contract = await remixClient.getContract() _contract = await remixClient.getContract()
} catch (e: any) { } catch (e: any) {
// if (setOutput === null || setOutput === undefined) { const errorGettingContract = {
const compileResult = {
status: 'failed', status: 'failed',
message: e.message message: e.message
} }
remixClient.eventEmitter.emit('setOutput', compileResult) remixClient.eventEmitter.emit('setOutput', errorGettingContract)
// } else {
// setOutput('', {status: 'failed', message: e.message})
// }
return return
} }
remixClient.changeStatus({ remixClient.changeStatus({
@ -200,7 +196,6 @@ export async function compileContract(contract: string, compilerUrl: string, set
let output let output
try { try {
output = await compile(compilerUrl, _contract) output = await compile(compilerUrl, _contract)
console.log('checking compile result', output)
remixClient.eventEmitter.emit('setOutput', output) remixClient.eventEmitter.emit('setOutput', output)
} catch (e: any) { } catch (e: any) {
remixClient.changeStatus({ remixClient.changeStatus({
@ -208,8 +203,7 @@ export async function compileContract(contract: string, compilerUrl: string, set
type: 'error', type: 'error',
title: `${e.message} debugging` title: `${e.message} debugging`
}) })
// setOutput !== null || setOutput !== undefined && setOutput('', {status: 'failed', message: e.message}) remixClient.eventEmitter.emit('setOutput', {status: 'failed', message: e.message, title: 'Error compiling...'})
remixClient.eventEmitter.emit('setOutput', {status: 'failed', message: e.message})
return return
} }
const compileReturnType = () => { const compileReturnType = () => {
@ -278,12 +272,12 @@ export async function compileContract(contract: string, compilerUrl: string, set
const data = toStandardOutput(_contract.name, output) const data = toStandardOutput(_contract.name, output)
remixClient.compilationFinish(_contract.name, _contract.content, data) remixClient.compilationFinish(_contract.name, _contract.content, data)
const contractName = _contract['name']
const compileResult = compileReturnType()
if (setOutput === null || setOutput === undefined) { if (setOutput === null || setOutput === undefined) {
const contractName = _contract['name']
const compileResult = compileReturnType()
remixClient.eventEmitter.emit('setOutput', { contractName, compileResult }) remixClient.eventEmitter.emit('setOutput', { contractName, compileResult })
} else { } else {
setOutput(_contract.name, compileReturnType()) remixClient.eventEmitter.emit('setOutput', { contractName, compileResult })
} }
} catch (err: any) { } catch (err: any) {
remixClient.changeStatus({ remixClient.changeStatus({

Loading…
Cancel
Save