diff --git a/tests/expected_json/external_function.external-function.json b/tests/expected_json/external_function.external-function.json index c31400a86..d6cfdbed9 100644 --- a/tests/expected_json/external_function.external-function.json +++ b/tests/expected_json/external_function.external-function.json @@ -2,11 +2,11 @@ { "contract": "ContractWithFunctionNotCalled", "filename": "tests/external_function.sol", - "func": "funcNotCalled3", + "func": "funcNotCalled", "sourceMapping": { "filename": "tests/external_function.sol", - "length": 41, - "start": 257 + "length": 40, + "start": 351 }, "vuln": "ExternalFunc" }, @@ -24,11 +24,11 @@ { "contract": "ContractWithFunctionNotCalled", "filename": "tests/external_function.sol", - "func": "funcNotCalled", + "func": "funcNotCalled3", "sourceMapping": { "filename": "tests/external_function.sol", - "length": 40, - "start": 351 + "length": 41, + "start": 257 }, "vuln": "ExternalFunc" }, diff --git a/tests/expected_json/naming_convention.naming-convention.json b/tests/expected_json/naming_convention.naming-convention.json index 1a4032780..f7cb8026c 100644 --- a/tests/expected_json/naming_convention.naming-convention.json +++ b/tests/expected_json/naming_convention.naming-convention.json @@ -1,4 +1,38 @@ [ + { + "argument": "_used", + "contract": "T", + "filename": "tests/naming_convention.sol", + "function": "test", + "sourceMapping": { + "filename": "tests/naming_convention.sol", + "length": 10, + "start": 748 + }, + "vuln": "NamingConvention" + }, + { + "contract": "T", + "filename": "tests/naming_convention.sol", + "sourceMapping": { + "filename": "tests/naming_convention.sol", + "length": 17, + "start": 695 + }, + "variable": "_myPublicVar", + "vuln": "NamingConvention" + }, + { + "constant": "l", + "contract": "T", + "filename": "tests/naming_convention.sol", + "sourceMapping": { + "filename": "tests/naming_convention.sol", + "length": 10, + "start": 847 + }, + "vuln": "NamingConvention" + }, { "contract": "naming", "filename": "tests/naming_convention.sol", @@ -93,39 +127,5 @@ "start": 545 }, "vuln": "NamingConvention" - }, - { - "argument": "_used", - "contract": "T", - "filename": "tests/naming_convention.sol", - "function": "test", - "sourceMapping": { - "filename": "tests/naming_convention.sol", - "length": 10, - "start": 748 - }, - "vuln": "NamingConvention" - }, - { - "contract": "T", - "filename": "tests/naming_convention.sol", - "sourceMapping": { - "filename": "tests/naming_convention.sol", - "length": 17, - "start": 695 - }, - "variable": "_myPublicVar", - "vuln": "NamingConvention" - }, - { - "constant": "l", - "contract": "T", - "filename": "tests/naming_convention.sol", - "sourceMapping": { - "filename": "tests/naming_convention.sol", - "length": 10, - "start": 847 - }, - "vuln": "NamingConvention" } ] diff --git a/tests/expected_json/uninitialized.uninitialized-state.json b/tests/expected_json/uninitialized.uninitialized-state.json index 345ce93b8..9981962dc 100644 --- a/tests/expected_json/uninitialized.uninitialized-state.json +++ b/tests/expected_json/uninitialized.uninitialized-state.json @@ -1,25 +1,4 @@ [ - { - "contract": "Uninitialized", - "filename": "tests/uninitialized.sol", - "functions": [ - "transfer" - ], - "sourceMapping": [ - { - "filename": "tests/uninitialized.sol", - "length": 19, - "start": 55 - }, - { - "filename": "tests/uninitialized.sol", - "length": 82, - "start": 81 - } - ], - "variable": "destination", - "vuln": "UninitializedStateVars" - }, { "contract": "Test", "filename": "tests/uninitialized.sol", @@ -82,5 +61,26 @@ ], "variable": "v", "vuln": "UninitializedStateVars" + }, + { + "contract": "Uninitialized", + "filename": "tests/uninitialized.sol", + "functions": [ + "transfer" + ], + "sourceMapping": [ + { + "filename": "tests/uninitialized.sol", + "length": 19, + "start": 55 + }, + { + "filename": "tests/uninitialized.sol", + "length": 82, + "start": 81 + } + ], + "variable": "destination", + "vuln": "UninitializedStateVars" } ]