Merge pull request #5346 from trufflesuite/test-optimize

Use test fixtures in encoder and compile-solidity

Author: cds-amal

packages/compile-solidity/test/fixture/default-box/.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["../../../../../.eslintrc.truffle.json"]
+}

packages/compile-solidity/test/fixture/default-box/contracts/ConvertLib.sol

@@ -0,0 +1,8 @@
+pragma solidity >=0.4.22 <0.7.0;
+
+library ConvertLib{
+	function convert(uint amount,uint conversionRate) public pure returns (uint convertedAmount)
+	{
+		return amount * conversionRate;
+	}
+}

packages/compile-solidity/test/fixture/default-box/contracts/MetaCoin.sol

@@ -0,0 +1,34 @@
+pragma solidity >=0.4.22 <0.7.0;
+
+import "./ConvertLib.sol";
+
+// This is just a simple example of a coin-like contract.
+// It is not standards compatible and cannot be expected to talk to other
+// coin/token contracts. If you want to create a standards-compliant
+// token, see: https://github.com/ConsenSys/Tokens. Cheers!
+
+contract MetaCoin {
+	mapping (address => uint) balances;
+
+	event Transfer(address indexed _from, address indexed _to, uint256 _value);
+
+	constructor() public {
+		balances[tx.origin] = 10000;
+	}
+
+	function sendCoin(address receiver, uint amount) public returns(bool sufficient) {
+		if (balances[msg.sender] < amount) return false;
+		balances[msg.sender] -= amount;
+		balances[receiver] += amount;
+		emit Transfer(msg.sender, receiver, amount);
+		return true;
+	}
+
+	function getBalanceInEth(address addr) public view returns(uint){
+		return ConvertLib.convert(getBalance(addr),2);
+	}
+
+	function getBalance(address addr) public view returns(uint) {
+		return balances[addr];
+	}
+}

packages/compile-solidity/test/fixture/default-box/migrations/2_deploy_contracts.js

@@ -0,0 +1,8 @@
+const ConvertLib = artifacts.require("ConvertLib");
+const MetaCoin = artifacts.require("MetaCoin");
+
+module.exports = function (deployer) {
+  deployer.deploy(ConvertLib);
+  deployer.link(ConvertLib, MetaCoin);
+  deployer.deploy(MetaCoin);
+};

packages/compile-solidity/test/fixture/default-box/test/TestMetacoin.sol

@@ -0,0 +1,25 @@
+pragma solidity >=0.4.22 <0.7.0;
+
+import "truffle/Assert.sol";
+import "truffle/DeployedAddresses.sol";
+import "../contracts/MetaCoin.sol";
+
+contract TestMetacoin {
+
+  function testInitialBalanceUsingDeployedContract() public {
+    MetaCoin meta = MetaCoin(DeployedAddresses.MetaCoin());
+
+    uint expected = 10000;
+
+    Assert.equal(meta.getBalance(tx.origin), expected, "Owner should have 10000 MetaCoin initially");
+  }
+
+  function testInitialBalanceWithNewMetaCoin() public {
+    MetaCoin meta = new MetaCoin();
+
+    uint expected = 10000;
+
+    Assert.equal(meta.getBalance(tx.origin), expected, "Owner should have 10000 MetaCoin initially");
+  }
+
+}

packages/compile-solidity/test/fixture/default-box/test/metacoin.js

@@ -0,0 +1,91 @@
+const MetaCoin = artifacts.require("MetaCoin");
+
+contract("MetaCoin", function (accounts) {
+  it("should put 10000 MetaCoin in the first account", function () {
+    return MetaCoin.deployed()
+      .then(function (instance) {
+        return instance.getBalance.call(accounts[0]);
+      })
+      .then(function (balance) {
+        assert.equal(
+          balance.valueOf(),
+          10000,
+          "10000 wasn't in the first account"
+        );
+      });
+  });
+  it("should call a function that depends on a linked library", function () {
+    var meta;
+    var metaCoinBalance;
+    var metaCoinEthBalance;
+
+    return MetaCoin.deployed()
+      .then(function (instance) {
+        meta = instance;
+        return meta.getBalance.call(accounts[0]);
+      })
+      .then(function (outCoinBalance) {
+        metaCoinBalance = parseInt(outCoinBalance);
+        return meta.getBalanceInEth.call(accounts[0]);
+      })
+      .then(function (outCoinBalanceEth) {
+        metaCoinEthBalance = parseInt(outCoinBalanceEth);
+      })
+      .then(function () {
+        assert.equal(
+          metaCoinEthBalance,
+          2 * metaCoinBalance,
+          "Library function returned unexpected function, linkage may be broken"
+        );
+      });
+  });
+  it("should send coin correctly", function () {
+    var meta;
+
+    // Get initial balances of first and second account.
+    var account_one = accounts[0];
+    var account_two = accounts[1];
+
+    var account_one_starting_balance;
+    var account_two_starting_balance;
+    var account_one_ending_balance;
+    var account_two_ending_balance;
+
+    var amount = 10;
+
+    return MetaCoin.deployed()
+      .then(function (instance) {
+        meta = instance;
+        return meta.getBalance.call(account_one);
+      })
+      .then(function (balance) {
+        account_one_starting_balance = parseInt(balance);
+        return meta.getBalance.call(account_two);
+      })
+      .then(function (balance) {
+        account_two_starting_balance = parseInt(balance);
+        return meta.sendCoin(account_two, amount, { from: account_one });
+      })
+      .then(function () {
+        return meta.getBalance.call(account_one);
+      })
+      .then(function (balance) {
+        account_one_ending_balance = parseInt(balance);
+        return meta.getBalance.call(account_two);
+      })
+      .then(function (balance) {
+        account_two_ending_balance = parseInt(balance);
+
+        assert.equal(
+          account_one_ending_balance,
+          account_one_starting_balance - amount,
+          "Amount wasn't correctly taken from the sender"
+        );
+        assert.equal(
+          account_two_ending_balance,
+          account_two_starting_balance + amount,
+          "Amount wasn't correctly sent to the receiver"
+        );
+      });
+  });
+});

packages/compile-solidity/test/fixture/default-box/truffle-config.js

@@ -0,0 +1,20 @@
+module.exports = {
+  networks: {
+    development: {
+      host: "localhost",
+      port: 8545,
+      network_id: "*", // Match any network id
+      gas: 5000000
+    }
+  },
+  compilers: {
+    solc: {
+      settings: {
+        optimizer: {
+          enabled: true, // Default: false
+          runs: 200 // Default: 200
+        }
+      }
+    }
+  }
+};

packages/compile-solidity/test/profiler/index.js

@@ -1,29 +1,38 @@
 const assert = require("chai").assert;
 const fs = require("fs-extra");
-const glob = require("glob");
-const { default: Box } = require("@truffle/box");
+const path = require("path");
+const tmp = require("tmp");
 const Profiler = require("../../dist/profiler");
 const { Resolver } = require("@truffle/resolver");
 const Artifactor = require("@truffle/artifactor");
+const TruffleConfig = require("@truffle/config");
+
+function createSandbox(source) {
+  if (!fs.existsSync(source)) {
+    throw new Error(`Sandbox failed: source: ${source} does not exist`);
+  }
+
+  const tempDir = tmp.dirSync({ unsafeCleanup: true });
+  fs.copySync(source, tempDir.name);
+  const config = TruffleConfig.load(
+    path.join(tempDir.name, "truffle-config.js"),
+    {}
+  );
+  return config;
+}
 
 describe("profiler", function () {
   var config;
 
-  before("Create a sandbox", async function () {
-    config = await Box.sandbox("default");
+  before("Create a sandbox", function () {
+    config = createSandbox(
+      path.join(__dirname, "..", "fixture", "default-box")
+    );
     config.resolver = new Resolver(config);
     config.artifactor = new Artifactor(config.contracts_build_directory);
     config.network = "development";
   });
 
-  after("Cleanup tmp files", function (done) {
-    glob("tmp-*", (err, files) => {
-      if (err) done(err);
-      files.forEach(file => fs.removeSync(file));
-      done();
-    });
-  });
-
   it("profiles example project successfully", async function () {
     const { allSources, compilationTargets } = await Profiler.requiredSources(
       config.with({