From 98cf38f6e7904b40bee0adbbf2ad8ff47347eb1c Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 13 Jul 2020 14:00:43 +0530 Subject: [PATCH] resolved conflicts --- .../src/solidity-analyzer/modules/abstractAstView.ts | 5 ----- .../src/solidity-analyzer/modules/blockTimestamp.ts | 4 ---- .../src/solidity-analyzer/modules/lowLevelCalls.ts | 6 ------ .../src/solidity-analyzer/modules/noReturn.ts | 6 ------ .../src/solidity-analyzer/modules/selfdestruct.ts | 6 +----- .../src/solidity-analyzer/modules/staticAnalysisCommon.ts | 5 ----- .../src/solidity-analyzer/modules/thisLocal.ts | 4 ---- .../src/solidity-analyzer/modules/txOrigin.ts | 4 ---- 8 files changed, 1 insertion(+), 39 deletions(-) diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts index c520e587d6..4acc562a15 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts @@ -1,11 +1,6 @@ import { getStateVariableDeclarationsFromContractNode, getInheritsFromName, getContractName, -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts - getFunctionOrModifierDefinitionParameterPart, getType, getDeclaredVariableName, getFunctionDefinitionReturnParameterPart, getCompilerVersion } from './staticAnalysisCommon' -import { AstWalker } from 'remix-astwalker' -======= getFunctionOrModifierDefinitionParameterPart, getType, getDeclaredVariableName, getFunctionDefinitionReturnParameterPart } from './staticAnalysisCommon' import { AstWalker } from '@remix-project/remix-astwalker' ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/abstractAstView.ts import { FunctionDefinitionAstNode, ParameterListAstNode, ModifierDefinitionAstNode, ContractHLAst, VariableDeclarationAstNode, FunctionHLAst, ReportObj, ReportFunction, VisitFunction, ModifierHLAst, CompilationResult } from '../../types' diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts index 7341924c6f..a71c650105 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts @@ -22,12 +22,8 @@ export default class blockTimestamp implements AnalyzerModule { // eslint-disable-next-line @typescript-eslint/no-unused-vars report (compilationResults: CompilationResult): ReportObj[] { -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts const version = getCompilerVersion(compilationResults.contracts) return this.warningNowNodes.map((item, i) => { -======= - return this.warningNowNodes.map((item) => { ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.ts return { warning: `Use of "now": "now" does not mean current time. "now" is an alias for "block.timestamp". "block.timestamp" can be influenced by miners to a certain degree, be careful.`, diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts index fefb4b087c..b53aff571a 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts @@ -38,16 +38,10 @@ export default class lowLevelCalls implements AnalyzerModule { // eslint-disable-next-line @typescript-eslint/no-unused-vars report (compilationResults: CompilationResult): ReportObj[] { -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts const version = getCompilerVersion(compilationResults.contracts) return this.llcNodes.map((item, i) => { let text: string = '' let morehref: string = '' -======= - return this.llcNodes.map((item) => { - let text = '' - let morehref = '' ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.ts switch (item.type) { case lowLevelCallTypes.CALL: text = `Use of "call": should be avoided whenever possible. diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/noReturn.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/noReturn.ts index 6e91b99d5b..222fbaee5f 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/noReturn.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/noReturn.ts @@ -21,13 +21,7 @@ export default class noReturn implements AnalyzerModule { ) report: ReportFunction = this.abstractAst.build_report(this._report.bind(this)) -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/noReturn.ts private _report (contracts: ContractHLAst[], multipleContractsWithSameName: boolean, version: string): ReportObj[] { -======= - - // eslint-disable-next-line @typescript-eslint/no-unused-vars - private _report (contracts: ContractHLAst[], multipleContractsWithSameName: boolean): ReportObj[] { ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/noReturn.ts const warnings: ReportObj[] = [] contracts.forEach((contract: ContractHLAst) => { diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts index f7617f475d..a5ac068cb8 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts @@ -20,12 +20,8 @@ export default class selfdestruct implements AnalyzerModule { ) report: ReportFunction = this.abstractAst.build_report(this._report.bind(this)) -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts - private _report (contracts: ContractHLAst[], multipleContractsWithSameName: boolean, version: string): ReportObj[] { -======= // eslint-disable-next-line @typescript-eslint/no-unused-vars - private _report (contracts: ContractHLAst[], multipleContractsWithSameName: boolean): ReportObj[] { ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts + private _report (contracts: ContractHLAst[], multipleContractsWithSameName: boolean, version: string): ReportObj[] { const warnings: ReportObj[] = [] contracts.forEach((contract) => { diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts index 67f63b62ce..0dd10212e7 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts @@ -3,13 +3,8 @@ import { FunctionDefinitionAstNode, ModifierDefinitionAstNode, ParameterListAstNode, ForStatementAstNode, WhileStatementAstNode, VariableDeclarationAstNode, ContractDefinitionAstNode, InheritanceSpecifierAstNode, MemberAccessAstNode, BinaryOperationAstNode, FunctionCallAstNode, ExpressionStatementAstNode, UnaryOperationAstNode, -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts - IdentifierAstNode, IndexAccessAstNode, BlockAstNode, AssignmentAstNode, InlineAssemblyAstNode, IfStatementAstNode, CompiledContractObj, ABIParameter, CompilationResult, CompiledContract } from "types" -import { util } from 'remix-lib' -======= IdentifierAstNode, IndexAccessAstNode, BlockAstNode, AssignmentAstNode, InlineAssemblyAstNode, IfStatementAstNode, CompiledContractObj, ABIParameter } from "../../types" import { util } from '@remix-project/remix-lib' ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts type SpecialObjDetail = { obj: string diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts index e3cf6a0507..3abcda5816 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts @@ -19,12 +19,8 @@ export default class thisLocal implements AnalyzerModule { // eslint-disable-next-line @typescript-eslint/no-unused-vars report (compilationResults: CompilationResult): ReportObj[] { -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts const version = getCompilerVersion(compilationResults.contracts) return this.warningNodes.map(function (item, i) { -======= - return this.warningNodes.map(function (item) { ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/thisLocal.ts return { warning: `Use of "this" for local functions: Never use "this" to call functions in the same contract, it only consumes more gas than normal local calls.`, location: item.src, diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts index e549c55a5d..c4f6570387 100644 --- a/libs/remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts +++ b/libs/remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts @@ -20,12 +20,8 @@ export default class txOrigin implements AnalyzerModule { // eslint-disable-next-line @typescript-eslint/no-unused-vars report (compilationResults: CompilationResult): ReportObj[] { -<<<<<<< HEAD:libs/remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts const version = getCompilerVersion(compilationResults.contracts) return this.txOriginNodes.map((item, i) => { -======= - return this.txOriginNodes.map((item) => { ->>>>>>> 3ce30ccb299e439bf2f3c0dbb2b69d8476c73c43:remix-analyzer/src/solidity-analyzer/modules/txOrigin.ts return { warning: `Use of tx.origin: "tx.origin" is useful only in very exceptional cases. If you use it for authentication, you usually want to replace it by "msg.sender", because otherwise any contract you call can act on your behalf.`,