Merge pull request #1053 from LianaHus/origin/compileRenaming

remix-analyzer/test/analysis/staticAnalysisIntegration-test.js

@@ -41,7 +41,7 @@ var testFileAsts = {}
 
 testFiles.forEach((fileName) => {
   var content = fs.readFileSync(path.join(__dirname, 'test-contracts', fileName), 'utf8')
-  testFileAsts[fileName] = JSON.parse(compiler.compileStandardWrapper(compilerInput(content)))
+  testFileAsts[fileName] = JSON.parse(compiler.compile(compilerInput(content)))
 })
 
 test('Integration test thisLocal.js', function (t) {

remix-analyzer/test/analysis/staticAnalysisIssues-test.js

@@ -11,7 +11,7 @@ var path = require('path')
 
 function compile (fileName) {
   var content = fs.readFileSync(path.join(__dirname, 'test-contracts', fileName), 'utf8')
-  return JSON.parse(compiler.compileStandardWrapper(compilerInput(content)))
+  return JSON.parse(compiler.compile(compilerInput(content)))
 }
 
 test('staticAnalysisIssues.functionParameterPassingError', function (t) {

remix-debug/package.json

@@ -23,8 +23,8 @@
     "fast-async": "^6.1.2",
     "notify-error": "^1.2.0",
     "npm-run-all": "^4.1.2",
-    "remix-lib": "0.3.11",
-    "solc": "^0.4.24"
+    "remix-lib": "^0.3.11",
+    "solc": "^0.5.0"
   },
   "devDependencies": {
     "standard": "^7.0.1",

remix-debug/test/decoder/contracts/byteStorage.js

@@ -6,10 +6,10 @@ module.exports = {
     enum enum1 { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15, e16, e17, e18, e19, e20, e21, e22, e23, e24, e25, e26, e27, e28, e29, e30, e31, e32, e33, e34, e35, e36, e37, e38, e39, e40, e41, e42, e43, e44, e45, e46, e47, e48, e49, e50, e51, e52, e53, e54, e55, e56, e57, e58, e59, e60, e61, e62, e63, e64, e65, e66, e67, e68, e69, e70, e71, e72, e73, e74, e75, e76, e77, e78, e79, e80, e81, e82, e83, e84, e85, e86, e87, e88, e89, e90, e91, e92, e93, e94, e95, e96, e97, e98, e99, e100, e101, e102, e103, e104, e105, e106, e107, e108, e109, e110, e111, e112, e113, e114, e115, e116, e117, e118, e119, e120, e121, e122, e123, e124, e125, e126, e127, e128, e129, e130, e131, e132, e133, e134, e135, e136, e137, e138, e139, e140, e141, e142, e143, e144, e145, e146, e147, e148, e149, e150, e151, e152, e153, e154, e155, e156, e157, e158, e159, e160, e161, e162, e163, e164, e165, e166, e167, e168, e169, e170, e171, e172, e173, e174, e175, e176, e177, e178, e179, e180, e181, e182, e183, e184, e185, e186, e187, e188, e189, e190, e191, e192, e193, e194, e195, e196, e197, e198, e199, e200, e201, e202, e203, e204, e205, e206, e207, e208, e209, e210, e211, e212, e213, e214, e215, e216, e217, e218, e219, e220, e221, e222, e223, e224, e225, e226, e227, e228, e229, e230, e231, e232, e233, e234, e235, e236, e237, e238, e239, e240, e241, e242, e243, e244, e245, e246, e247, e248, e249, e250, e251, e252, e253, e254, e255, e256, e257, e258, e259, e260 }
 
     bool b1 = false;
-    address a1 = 0xfe350f199f244ac9a79038d254400b632a633225;
+    address a1 = 0xfE350f199F244ac9A79038d254400b632a633225;
     bool b2 = true;
     bytes dynb1 = "dynamicbytes";
-    byte stab = 0x1;
+    byte stab = 0x01;
     bytes1 stab1 = hex"12";
     bytes2 stab2 = hex"1579";
     bytes3 stab3 = hex"359356";

remix-debug/test/decoder/contracts/intLocal.js

@@ -9,7 +9,7 @@ contract proxy {
     }
 }
 contract intLocal {
-    function intLocal () {
+    constructor () public {
       proxy.testStruct memory p;
       uint8 ui8 = 130;
       uint16 ui16 = 456;
@@ -31,11 +31,11 @@ contract intLocal {
       level11();
     }
     
-    function level11() {
+    function level11() public {
       uint8 ui8 = 123;
       level12();
     }
-    function level12() {
+    function level12() public {
       uint8 ui81 = 12;
     }
   }

remix-debug/test/decoder/contracts/mappingStorage.js

 module.exports = {
   contract: `
-  pragma solidity ^0.4.19;
+  pragma solidity ^0.5.0;
 
 contract SimpleMappingState {
     uint _num;
     mapping(string => uint) _iBreakSolidityState;
     mapping(uint => uint) _iBreakSolidityStateInt;
-    function updateNum(uint num, string str) public {
+    function updateNum(uint num, string memory str) public {
         _num = num;
         _iBreakSolidityState[str] = num;
         _iBreakSolidityStateInt[num] = num;

remix-debug/test/decoder/contracts/miscLocal.js

@@ -9,7 +9,7 @@ contract miscLocal {
             three, 
             four
         }
-        function miscLocal () {
+        constructor () public {
             bool boolFalse = false;
             bool boolTrue = true;
             enumDef testEnum;
@@ -31,7 +31,7 @@ contract miscLocal {
   }
 
   contract miscLocal2 {
-      function miscLocal2 () {
+      constructor () public {
            bytes memory dynbytes = "dynamicbytes";
            string memory smallstring = "test_test_test";
         }

remix-debug/test/decoder/contracts/simpleContract.js

@@ -17,6 +17,7 @@ module.exports = `
     
     contract test1 {
         struct str {
+            uint8 ui;
         }
     }
 

remix-debug/test/decoder/contracts/structArrayLocal.js

@@ -24,7 +24,7 @@ contract structArrayLocal {
         enumdef c;
     }    
     
-    function structArrayLocal () {
+    constructor () public {
         bytes memory bytesSimple = "test_super";
         teststruct memory e;
         e.a = "test";

remix-debug/test/decoder/contracts/structArrayStorage.js

@@ -25,7 +25,7 @@ module.exports = {
         string str;
     }
     simpleStruct[][3] arrayStruct;
-    function structArrayStorage () {
+    constructor () public {
         intStructDec.i8 = 32;
         intStructDec.i16 = -54;
         intStructDec.ui32 = 128;

remix-debug/test/decoder/decodeInfo.js

@@ -12,7 +12,7 @@ var util = require('../../src/solidity-decoder/types/util')
 
 tape('solidity', function (t) {
   t.test('astHelper, decodeInfo', function (st) {
-    var output = compiler.compileStandardWrapper(compilerInput(contracts))
+    var output = compiler.compile(compilerInput(contracts))
     output = JSON.parse(output)
 
     var state = astHelper.extractStateDefinitions('test.sol:contractUint', output.sources)
@@ -65,9 +65,8 @@ tape('solidity', function (t) {
     parsedType = decodeInfo.parseType(stateDef[5].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[5]))
     checkDecodeInfo(st, parsedType, 1, 2, 'int16')
 
-    output = compiler.compileStandardWrapper(compilerInput(simplecontracts))
+    output = compiler.compile(compilerInput(simplecontracts))
     output = JSON.parse(output)
-
     state = astHelper.extractStateDefinitions('test.sol:simpleContract', output.sources)
     states = astHelper.extractStatesDefinitions(output.sources)
     stateDef = state.stateDefinitions
@@ -81,10 +80,10 @@ tape('solidity', function (t) {
     state = astHelper.extractStateDefinitions('test.sol:test2', output.sources)
     stateDef = state.stateDefinitions
     parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'test1', util.extractLocationFromAstVariable(stateDef[0]))
-    checkDecodeInfo(st, parsedType, 0, 32, 'struct test1.str')
+    checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str')
 
     state = stateDecoder.extractStateVariables('test.sol:test2', output.sources)
-    checkDecodeInfo(st, parsedType, 0, 32, 'struct test1.str')
+    checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str')
 
     st.end()
   })

remix-debug/test/decoder/localDecoder.js

@@ -21,16 +21,16 @@ tape('solidity', function (t) {
 })
 
 function test (st, vm, privateKey) {
-  var output = compiler.compileStandardWrapper(compilerInput(intLocal.contract))
+  var output = compiler.compile(compilerInput(intLocal.contract))
   output = JSON.parse(output)
   intLocalTest(st, vm, privateKey, output.contracts['test.sol']['intLocal'].evm.bytecode.object, output, function () {
-    output = compiler.compileStandardWrapper(compilerInput(miscLocal.contract))
+    output = compiler.compile(compilerInput(miscLocal.contract))
     output = JSON.parse(output)
     miscLocalTest(st, vm, privateKey, output.contracts['test.sol']['miscLocal'].evm.bytecode.object, output, function () {
-      output = compiler.compileStandardWrapper(compilerInput(miscLocal.contract))
+      output = compiler.compile(compilerInput(miscLocal.contract))
       output = JSON.parse(output)
       misc2LocalTest(st, vm, privateKey, output.contracts['test.sol']['miscLocal2'].evm.bytecode.object, output, function () {
-        output = compiler.compileStandardWrapper(compilerInput(structArrayLocal.contract))
+        output = compiler.compile(compilerInput(structArrayLocal.contract))
         output = JSON.parse(output)
         structArrayLocalTest(st, vm, privateKey, output.contracts['test.sol']['structArrayLocal'].evm.bytecode.object, output, function () {
           st.end()

remix-debug/test/decoder/stateTests/mapping.js

@@ -13,7 +13,7 @@ module.exports = function testMappingStorage (st, cb) {
   var mappingStorage = require('../contracts/mappingStorage')
   var privateKey = Buffer.from('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a', 'hex')
   var vm = vmCall.initVM(st, privateKey)
-  var output = compiler.compileStandardWrapper(compilerInput(mappingStorage.contract))
+  var output = compiler.compile(compilerInput(mappingStorage.contract))
   output = JSON.parse(output)
   vmCall.sendTx(vm, {nonce: 0, privateKey: privateKey}, null, 0, output.contracts['test.sol']['SimpleMappingState'].evm.bytecode.object, function (error, txHash) {
     if (error) {
@@ -48,7 +48,7 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
                 var traceManager = new TraceManager({web3: vm.web3})
                 traceManager.resolveTrace(tx, () => {
                   var storageViewer = new StorageViewer({
-                    stepIndex: 213,
+                    stepIndex: 268,
                     tx: tx,
                     address: contractAddress
                   }, new StorageResolver({web3: vm.web3}), traceManager)

remix-debug/test/decoder/storageDecoder.js

@@ -23,7 +23,7 @@ tape('solidity', function (t) {
 
 function testIntStorage (st, cb) {
   var intStorage = require('./contracts/intStorage')
-  var output = compiler.compileStandardWrapper(compilerInput(intStorage.contract))
+  var output = compiler.compile(compilerInput(intStorage.contract))
   output = JSON.parse(output)
   var mockStorageResolver
   for (var storage of [intStorage.fullStorage, shrinkStorage(intStorage.fullStorage)]) {
@@ -70,7 +70,7 @@ function testIntStorage (st, cb) {
 
 function testByteStorage (st, cb) {
   var byteStorage = require('./contracts/byteStorage')
-  var output = compiler.compileStandardWrapper(compilerInput(byteStorage.contract))
+  var output = compiler.compile(compilerInput(byteStorage.contract))
   output = JSON.parse(output)
   var mockStorageResolver
   for (var storage of [byteStorage.storage, shrinkStorage(byteStorage.storage)]) {
@@ -183,7 +183,7 @@ function shrinkStorage (storage) {
 
 function testStructArrayStorage (st, cb) {
   var structArrayStorage = require('./contracts/structArrayStorage')
-  var output = compiler.compileStandardWrapper(compilerInput(structArrayStorage.contract))
+  var output = compiler.compile(compilerInput(structArrayStorage.contract))
   output = JSON.parse(output)
   var mockStorageResolver = new MockStorageResolver(structArrayStorage.storage)
   stateDecoder.solidityState(mockStorageResolver, output.sources, 'structArrayStorage').then((decoded) => {

remix-debug/test/decoder/storageLocation.js

@@ -8,7 +8,7 @@ var compilerInput = remixLib.helpers.compiler.compilerInput
 
 tape('solidity', function (t) {
   t.test('storage location', function (st) {
-    var output = compiler.compileStandardWrapper(compilerInput(contracts))
+    var output = compiler.compile(compilerInput(contracts))
     output = JSON.parse(output)
     var stateDec = stateDecoder.extractStateVariables('contractUint', output.sources)
     checkLocation(st, stateDec[0].storagelocation, 0, 0)

remix-debug/test/tests.js

@@ -17,7 +17,7 @@ tape('debug contract', function (t) {
   t.plan(12)
   var privateKey = Buffer.from('dae9801649ba2d95a21e688b56f77905e5667c44ce868ec83f82e838712a2c7a', 'hex')
   var vm = vmCall.initVM(t, privateKey)
-  var output = compiler.compileStandardWrapper(compilerInput(ballot))
+  var output = compiler.compile(compilerInput(ballot))
   output = JSON.parse(output)
   var web3VM = new remixLib.vm.Web3VMProvider()
   web3VM.setVM(vm)
@@ -109,8 +109,8 @@ function testDebugging (t, debugManager) {
 
   breakPointManager.event.register('breakpointHit', function (sourceLocation, step) {
     console.log('breakpointHit')
-    t.equal(JSON.stringify(sourceLocation), JSON.stringify({ start: 591, length: 1, file: 0, jump: '-' }))
-    t.equal(step, 75)
+    t.equal(JSON.stringify(sourceLocation), JSON.stringify({ start: 587, length: 1, file: 0, jump: '-' }))
+    t.equal(step, 74)
   })
 
   breakPointManager.event.register('noBreakpointHit', function () {
@@ -120,7 +120,7 @@ function testDebugging (t, debugManager) {
   breakPointManager.jumpNextBreakpoint(0, true)
 }
 
-var ballot = `pragma solidity ^0.4.0;
+var ballot = `pragma solidity ^0.5.0;
 contract Ballot {
 
     struct Voter {
@@ -138,13 +138,13 @@ contract Ballot {
     Proposal[] proposals;
 
     /// Create a new ballot with $(_numProposals) different proposals.
-    function Ballot() public {
+    constructor() public {
         uint p = 45;
         chairperson = msg.sender;
         address addressLocal = msg.sender; // copy of state variable
         voters[chairperson].weight = 1;
         proposals.length = 1;
-        Proposal[] proposalsLocals = proposals; // copy of state variable
+        Proposal[] storage proposalsLocals = proposals; // copy of state variable
     }
 
     /// Give $(toVoter) the right to vote on this ballot.
@@ -179,7 +179,7 @@ contract Ballot {
         proposals[toProposal].voteCount += sender.weight;
     }
 
-    function winningProposal() public constant returns (uint8 _winningProposal) {
+    function winningProposal() public view returns (uint8 _winningProposal) {
         uint256 winningVoteCount = 0;
         for (uint8 prop = 0; prop < proposals.length; prop++)
             if (proposals[prop].voteCount > winningVoteCount) {

remix-lib/package.json

@@ -27,7 +27,7 @@
     "ethereumjs-vm": "^2.3.3",
     "ethers": "^3.0.15",
     "fast-async": "^6.1.2",
-    "solc": "^0.4.13",
+    "solc": "^0.5.0",
     "standard": "^7.0.1",
     "tape": "^4.6.0",
     "web3": "0.20.6"

remix-lib/test/sourceMappingDecoder.js

@@ -7,7 +7,7 @@ var compilerInput = require('../src/helpers/compilerHelper').compilerInput
 
 tape('SourceMappingDecoder', function (t) {
   t.test('SourceMappingDecoder.findNodeAtInstructionIndex', function (st) {
-    var output = compiler.compileStandardWrapper(compilerInput(contracts))
+    var output = compiler.compile(compilerInput(contracts))
     output = JSON.parse(output)
     var sourceMappingDecoder = new SourceMappingDecoder()
     var node = sourceMappingDecoder.findNodeAtInstructionIndex('FunctionDefinition', 2, output.contracts['test.sol']['test'].evm.deployedBytecode.sourceMap, output.sources['test.sol'])
@@ -107,12 +107,12 @@ tape('SourceMappingDecoder', function (t) {
 })
 
 var contracts = `contract test {
-    function f1() returns (uint) {
+    function f1() public returns (uint) {
         uint t = 4;
         return t;
     }
     
-    function f2() {
+    function f2() public {
         
     }
 }

remix-solidity/package.json

@@ -22,8 +22,8 @@
     "ethereumjs-vm": "^2.3.3",
     "fast-async": "^6.1.2",
     "npm-run-all": "^4.0.2",
-    "remix-lib": "0.3.11",
-    "solc": "^0.4.24",
+    "remix-lib": "^0.3.11",
+    "solc": "^0.5.0",
     "standard": "^7.0.1",
     "tape": "^4.6.0",
     "webworkify": "^1.2.1"

remix-solidity/src/compiler/compiler-worker.js

@@ -22,7 +22,7 @@ module.exports = function (self) {
 
         compileJSON = function (input) {
           try {
-            return compiler.compileStandardWrapper(input, function (path) {
+            return compiler.compile(input, function (path) {
               missingInputs.push(path)
               return { 'error': 'Deferred import' }
             })

remix-solidity/src/compiler/compiler.js

@@ -90,7 +90,7 @@ function Compiler (handleImportCall) {
         var result
         try {
           var input = compilerInput(source.sources, {optimize: optimize, target: source.target})
-          result = compiler.compileStandardWrapper(input, missingInputsCallback)
+          result = compiler.compile(input, missingInputsCallback)
           result = JSON.parse(result)
         } catch (exception) {
           result = { error: { formattedMessage: 'Uncaught JavaScript exception:\n' + exception, severity: 'error', mode: 'panic' } }

remix-tests/examples/simple_storage.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 contract SimpleStorage {
   uint public storedData;
 
-  function SimpleStorage() public {
+  constructor() public {
     storedData = 100;
   }
 

remix-tests/examples/simple_storage2_test.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 import "remix_tests.sol";
 import "./simple_storage.sol";
 
 contract MyTest2 {
-  SimpleStorage foo;
-  uint i = 0;
+  SimpleStorage storage foo;
+  uint storage i = 0;
 
-  function beforeAll() {
+  function beforeAll() public {
     foo = new SimpleStorage();
   }
 
-  function beforeEach() {
+  function beforeEach() public {
     if (i == 1) {
       foo.set(200);
     }
     i += 1;
   }
 
-  function initialValueShouldBe100() public constant returns (bool) {
+  function initialValueShouldBe100() public view returns (bool) {
     return Assert.equal(foo.get(), 100, "initial value is not correct");
   }
 
-  function initialValueShouldBe200() public constant returns (bool) {
+  function initialValueShouldBe200() public view returns (bool) {
     return Assert.equal(foo.get(), 200, "initial value is not correct");
   }
 

remix-tests/examples/simple_storage_test.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 import "./simple_storage.sol";
 
 contract MyTest {
-  SimpleStorage foo;
-  uint i = 0;
+  SimpleStorage storage foo;
+  uint storage i = 0;
 
-  function beforeAll() {
+  function beforeAll() public {
     foo = new SimpleStorage();
   }
 
-  function beforeEach() {
+  function beforeEach() public {
     if (i == 1) {
       foo.set(200);
     }

remix-tests/package.json

@@ -45,7 +45,7 @@
     "remix-simulator": "0.0.6",
     "remix-solidity": "0.2.12",
     "signale": "^1.2.1",
-    "solc": "^0.4.24",
+    "solc": "^0.5.0",
     "standard": "^10.0.3",
     "web3": "1.0.0-beta.36",
     "winston": "^3.0.0"

remix-tests/sol/tests.sol.js

 module.exports = `
-pragma solidity ^0.4.7;
-
 library Assert {
 
   event AssertionEvent(
@@ -8,107 +6,107 @@ library Assert {
     string message
   );
 
-  function ok(bool a, string message) public returns (bool result) {
+  function ok(bool a, string memory message) public returns (bool result) {
     result = a;
     emit AssertionEvent(result, message);
   }
 
-  function equal(uint a, uint b, string message) public returns (bool result) {
+  function equal(uint a, uint b, string memory message) public returns (bool result) {
     result = (a == b);
     emit AssertionEvent(result, message);
   }
 
-  function equal(int a, int b, string message) public returns (bool result) {
+  function equal(int a, int b, string memory message) public returns (bool result) {
     result = (a == b);
     emit AssertionEvent(result, message);
   }
 
-  function equal(bool a, bool b, string message) public returns (bool result) {
+  function equal(bool a, bool b, string memory message) public returns (bool result) {
     result = (a == b);
     emit AssertionEvent(result, message);
   }
 
   // TODO: only for certain versions of solc
-  //function equal(fixed a, fixed b, string message) public returns (bool result) {
+  //function equal(fixed a, fixed b, string memory message) public returns (bool result) {
   //  result = (a == b);
   //  emit AssertionEvent(result, message);
   //}
 
   // TODO: only for certain versions of solc
-  //function equal(ufixed a, ufixed b, string message) public returns (bool result) {
+  //function equal(ufixed a, ufixed b, string memory message) public returns (bool result) {
   //  result = (a == b);
   //  emit AssertionEvent(result, message);
   //}
 
-  function equal(address a, address b, string message) public returns (bool result) {
+  function equal(address a, address b, string memory message) public returns (bool result) {
     result = (a == b);
     emit AssertionEvent(result, message);
   }
 
-  function equal(bytes32 a, bytes32 b, string message) public returns (bool result) {
+  function equal(bytes32 a, bytes32 b, string memory message) public returns (bool result) {
     result = (a == b);
     emit AssertionEvent(result, message);
   }
 
-  function equal(string a, string b, string message) public returns (bool result) {
-     result = (keccak256(a) == keccak256(b));
-     AssertionEvent(result, message);
+  function equal(string memory a, string memory b, string memory message) public returns (bool result) {
+     result = (keccak256(abi.encode(a)) == keccak256(abi.encode(b)));
+     emit AssertionEvent(result, message);
   }
 
-  function notEqual(uint a, uint b, string message) public returns (bool result) {
+  function notEqual(uint a, uint b, string memory message) public returns (bool result) {
     result = (a != b);
     emit AssertionEvent(result, message);
   }
 
-  function notEqual(int a, int b, string message) public returns (bool result) {
+  function notEqual(int a, int b, string memory message) public returns (bool result) {
     result = (a != b);
     emit AssertionEvent(result, message);
   }
 
-  function notEqual(bool a, bool b, string message) public returns (bool result) {
+  function notEqual(bool a, bool b, string memory message) public returns (bool result) {
     result = (a != b);
     emit AssertionEvent(result, message);
   }
 
   // TODO: only for certain versions of solc
-  //function notEqual(fixed a, fixed b, string message) public returns (bool result) {
+  //function notEqual(fixed a, fixed b, string memory message) public returns (bool result) {
   //  result = (a != b);
   //  emit AssertionEvent(result, message);
   //}
 
   // TODO: only for certain versions of solc
-  //function notEqual(ufixed a, ufixed b, string message) public returns (bool result) {
+  //function notEqual(ufixed a, ufixed b, string memory message) public returns (bool result) {
   //  result = (a != b);
   //  emit AssertionEvent(result, message);
   //}
 
-  function notEqual(address a, address b, string message) public returns (bool result) {
+  function notEqual(address a, address b, string memory message) public returns (bool result) {
     result = (a != b);
     emit AssertionEvent(result, message);
   }
 
-  function notEqual(bytes32 a, bytes32 b, string message) public returns (bool result) {
+  function notEqual(bytes32 a, bytes32 b, string memory message) public returns (bool result) {
     result = (a != b);
     emit AssertionEvent(result, message);
   }
 
-  function notEqual(string a, string b, string message) public returns (bool result) {
-    result = (keccak256(a) != keccak256(b));
-    AssertionEvent(result, message);
+  function notEqual(string memory a, string memory b, string memory message) public returns (bool result) {
+    result = (keccak256(abi.encode(a)) != keccak256(abi.encode(b)));
+    emit AssertionEvent(result, message);
   }
 
   /*----------------- Greater than --------------------*/
-  function greaterThan(uint a, uint b, string message) public constant returns (bool result) {
+  function greaterThan(uint a, uint b, string memory message) public returns (bool result) {
     result = (a > b);
     emit AssertionEvent(result, message);
   }
 
-  function greaterThan(int a, int b, string message) public constant returns (bool result) {
+  function greaterThan(int a, int b, string memory message) public returns (bool result) {
     result = (a > b);
     emit AssertionEvent(result, message);
   }
   // TODO: safely compare between uint and int
-  function greaterThan(uint a, int b, string message) public constant returns (bool result) {
+  function greaterThan(uint a, int b, string memory message) public returns (bool result) {
     if(b < int(0)) {
       // int is negative uint "a" always greater
       result = true;
@@ -117,7 +115,7 @@ library Assert {
     }
     emit AssertionEvent(result, message);
   }
-  function greaterThan(int a, uint b, string message) public constant returns (bool result) {
+  function greaterThan(int a, uint b, string memory message) public returns (bool result) {
     if(a < int(0)) {
       // int is negative uint "b" always greater
       result = false;
@@ -127,17 +125,17 @@ library Assert {
     emit AssertionEvent(result, message);
   }
   /*----------------- Lesser than --------------------*/
-  function lesserThan(uint a, uint b, string message) public constant returns (bool result) {
+  function lesserThan(uint a, uint b, string memory message) public returns (bool result) {
     result = (a < b);
     emit AssertionEvent(result, message);
   }
 
-  function lesserThan(int a, int b, string message) public constant returns (bool result) {
+  function lesserThan(int a, int b, string memory message) public returns (bool result) {
     result = (a < b);
     emit AssertionEvent(result, message);
   }
   // TODO: safely compare between uint and int
-  function lesserThan(uint a, int b, string message) public constant returns (bool result) {
+  function lesserThan(uint a, int b, string memory message) public returns (bool result) {
     if(b < int(0)) {
       // int is negative int "b" always lesser
       result = false;
@@ -147,7 +145,7 @@ library Assert {
     emit AssertionEvent(result, message);
   }
 
-  function lesserThan(int a, uint b, string message) public constant returns (bool result) {
+  function lesserThan(int a, uint b, string memory message) public returns (bool result) {
     if(a < int(0)) {
       // int is negative int "a" always lesser
       result = true;

remix-tests/sol/tests_accounts.sol.js

-module.exports = `pragma solidity ^0.4.7;
-
+module.exports = `
 library TestsAccounts {
-    function getAccount(uint index) returns (address) {
+    function getAccount(uint index) public returns (address) {
         >accounts<
         return accounts[index];
     }

remix-tests/src/compiler.js

@@ -11,7 +11,8 @@ String.prototype.regexIndexOf = function (regex, startpos) {
 
 function writeTestAccountsContract (accounts) {
   var testAccountContract = require('../sol/tests_accounts.sol.js')
-  var body = 'address[' + accounts.length + '] memory accounts'
+  // TODO: this will only work for solidity 0.5.0
+  var body = 'address payable[' + accounts.length + '] memory accounts'
   if (!accounts.length) body += ';'
   else {
     body += '= [' + accounts.map((value) => { return `address(${value})` }).join(',') + '];'

remix-tests/tests/examples_1/simple_storage.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 contract SimpleStorage {
   uint public storedData;
 
-  function SimpleStorage() public {
+  constructor() public {
     storedData = 100;
   }
 

remix-tests/tests/examples_1/simple_storage_test.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 import "./simple_storage.sol";
 
 contract MyTest {
   SimpleStorage foo;
 
-  function beforeAll() {
+  function beforeAll() public {
     foo = new SimpleStorage();
   }
 
-  function initialValueShouldBe100() public constant returns (bool) {
+  function initialValueShouldBe100() public view returns (bool) {
     //return Assert.equal(foo.get(), 100, "initial value is not correct");
     return foo.get() == 100;
   }
 
-  function initialValueShouldBe200() public constant returns (bool) {
+  function initialValueShouldBe200() public view returns (bool) {
     //return Assert.equal(foo.get(), 200, "initial value is not correct");
     return foo.get() == 200;
   }

remix-tests/tests/examples_2/simple_storage.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 contract SimpleStorage {
   uint public storedData;
 
-  function SimpleStorage() public {
+  constructor() public {
     storedData = 100;
   }
 

remix-tests/tests/examples_2/simple_storage_test.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 import "./simple_storage.sol";
 
 contract MyTest {
   SimpleStorage foo;
   uint i = 0;
 
-  function beforeEach() {
+  function beforeEach() public {
     foo = new SimpleStorage();
     if (i == 1) {
       foo.set(200);
@@ -13,12 +13,12 @@ contract MyTest {
     i += 1;
   }
 
-  function initialValueShouldBe100() public constant returns (bool) {
+  function initialValueShouldBe100() public view returns (bool) {
     //return Assert.equal(foo.get(), 100, "initial value is not correct");
     return foo.get() == 100;
   }
 
-  function initialValueShouldBe200() public constant returns (bool) {
+  function initialValueShouldBe200() public view returns (bool) {
     //return Assert.equal(foo.get(), 200, "initial value is not correct");
     return foo.get() == 200;
   }

remix-tests/tests/examples_3/simple_string.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 contract SimpleString {
   string public storedData;
 
-  function SimpleString() public {
+  constructor() public {
     storedData = "Hello world!";
   }
 
-  function get() public view returns (string retVal) {
+  function get() public view returns (string memory retVal) {
     return storedData;
   }
 }

remix-tests/tests/examples_3/simple_string_test.sol

-pragma solidity ^0.4.7;
+pragma solidity ^0.5.0;
 import "./simple_string.sol";
 
 contract StringTest {
   SimpleString foo;
 
-  function beforeAll() {
+  function beforeAll() public {
     foo = new SimpleString();
   }
 
-  function initialValueShouldBeHello() public constant returns (bool) {
+  function initialValueShouldBeHello() public returns (bool) {
     return Assert.equal(foo.get(), "Hello world!", "initial value is not correct");
   }
 
-  function valueShouldNotBeHelloWorld() public constant returns (bool) {
+  function valueShouldNotBeHelloWorld() public returns (bool) {
     return Assert.notEqual(foo.get(), "Hello wordl!", "initial value is not correct");
   }
 
-  function valueShouldBeHelloWorld() public constant returns (bool) {
+  function valueShouldBeHelloWorld() public returns (bool) {
     return Assert.equal(foo.get(), "Hello wordl!", "initial value is not correct");
   }
 }

remix-tests/tests/examples_4/SafeMath_test.sol

@@ -10,7 +10,7 @@ contract SafeMathTest {
     safemathproxy = new SafeMathProxy();
   }
 
-  function unsafeMultiplicationShouldOverflow() public constant returns (bool) {
+  function unsafeMultiplicationShouldOverflow() public view returns (bool) {
     uint256 a = 4;
     uint256 b = 2 ** 256 - 1;
     return Assert.equal(
@@ -20,7 +20,7 @@ contract SafeMathTest {
     );
   }
 
-  function safeMultiplicationShouldRevert() public constant returns (bool) {
+  function safeMultiplicationShouldRevert() public view returns (bool) {
     uint256 a = 4;
     uint256 b = 2 ** 256 - 1;
     return Assert.equal(
@@ -30,7 +30,7 @@ contract SafeMathTest {
     );
   }
 
-  function safeDivisionByZeroShouldRevert() public constant returns (bool) {
+  function safeDivisionByZeroShouldRevert() public view returns (bool) {
     uint256 a = 4;
     uint256 b = 0;
     return Assert.equal(
@@ -40,7 +40,7 @@ contract SafeMathTest {
     );
   }
 
-  function unsafeSubtractShouldUnderflow() public constant returns (bool) {
+  function unsafeSubtractShouldUnderflow() public view returns (bool) {
     uint256 a = 0;
     uint256 b = a - 1;
     return Assert.equal(

remix-tests/tests/number/number_test.sol

-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 contract IntegerTest {
 
   // GREATER THAN [>] tests
-  function _2_shouldBeGreaterThan_1() public constant returns (bool) {
+  function _2_shouldBeGreaterThan_1() public returns (bool) {
     return Assert.greaterThan(uint(2), uint(1), "2 is greater than 1");
   }
 
-  function _0_shouldBeGreaterThan_neg_1() public constant returns (bool) {
+  function _0_shouldBeGreaterThan_neg_1() public returns (bool) {
     return Assert.greaterThan(uint(0), int(-1), "0 is greater than -1");
   }
 
-  function _neg_1_shouldNotBeGreaterThan_1() public constant returns (bool) {
+  function _neg_1_shouldNotBeGreaterThan_1() public returns (bool) {
     return Assert.greaterThan(int(-1), uint(1), "-1 is not greater than 1");
   }
 
-  function _1_shouldBeGreaterThan_neg_1() public constant returns (bool) {
+  function _1_shouldBeGreaterThan_neg_1() public returns (bool) {
     return Assert.greaterThan(uint(1), int(-1), "1 is greater than -1");
   }
 
   // LESSER THAN [<] tests
-  function _1_shouldBeLesserThan_2() public constant returns (bool) {
+  function _1_shouldBeLesserThan_2() public returns (bool) {
     return Assert.lesserThan(uint(1), uint(2), "1 is lesser than 2");
   }
 
-  function _neg_1_shouldBeLesserThan_0() public constant returns (bool) {
+  function _neg_1_shouldBeLesserThan_0() public returns (bool) {
     return Assert.lesserThan(int(-1), uint(0), "-1 is lesser than 0");
   }
 
-  function _neg_2_shouldBeLesserThan_neg_1() public constant returns (bool) {
+  function _neg_2_shouldBeLesserThan_neg_1() public returns (bool) {
     return Assert.lesserThan(int(-2), int(-1), "-2 is lesser than -1");
   }
 
-  function _0_shouldNotBeLesserThan_neg_1() public constant returns (bool) {
+  function _0_shouldNotBeLesserThan_neg_1() public returns (bool) {
     return Assert.lesserThan(uint(0), int(-1), "0 is not lesser than -1");
   }
 }

remix-tests/tests/testRunner.js

@@ -134,7 +134,7 @@ describe('testRunner', function () {
       it('should returns 3 messages', function () {
         assert.deepEqual(tests, [
           { type: 'contract', value: 'StringTest', filename: 'simple_string_test.sol' },
-          { type: 'testFailure', value: 'Value should be hello world', time: 1, context: 'StringTest', "errMsg": "function returned false" },
+          { type: 'testFailure', value: 'Value should be hello world', time: 1, context: 'StringTest', "errMsg": "initial value is not correct" },
           { type: 'testPass', value: 'Value should not be hello world', time: 1, context: 'StringTest' },
           { type: 'testPass', value: 'Initial value should be hello', time: 1, context: 'StringTest' },
         ])

remix-tests/tests/various_sender/sender_test.sol

-pragma solidity ^0.4.7;
 import "remix_tests.sol"; // this import is automatically injected by Remix.
 import "remix_accounts.sol";
 
 contract SenderTest {
    
-    function beforeAll () {}
+    function beforeAll () public {}
     
     /// 1
     function checkSenderIs1 () public {