Merge pull request #929 from dapphub/rm-dapp2-refs

Author: d-xo

nix/solidity-package.nix

@@ -20,7 +20,6 @@ in
     , extract ? true
     , deps ? []
     , solc ? pkgs.solc
-    , test-hevm ? pkgs.dapp2.test-hevm
     , hevm ? pkgs.hevm
     , solcFlags ? ""
     , flatten ? false
@@ -29,8 +28,7 @@ in
       pkgs.stdenv.mkDerivation (rec {
         inherit doCheck extract;
         buildInputs = [ solc pkgs.jq ]
-          ++ (pkgs.lib.optional (test-hevm != null) test-hevm)
-          ++ pkgs.lib.optional flatten hevm;
+          ++ pkgs.lib.optional (flatten || doCheck) hevm;
         passthru = {
           remappings = remappings deps;
           libPaths = libPaths deps;

nix/solidity-package.sh

@@ -17,8 +17,8 @@ mapfile -t files < <(find "$dir/src" -name '*.sol')
 json_file="out/dapp.sol.json"
 (set -x; solc $REMAPPINGS "${opts[@]}" $solcFlags "${files[@]}" > "$json_file")
 
-if [[ "$doCheck" == 1 ]] && command -v dapp2-test-hevm >/dev/null 2>&1; then
-  DAPP_OUT=out dapp2-test-hevm
+if [[ "$doCheck" == 1 ]]; then
+  DAPP_OUT=out dapp test
 fi
 
 if [[ $flatten == 1 && ! $x =~ \.t(\.[a-z0-9]+)*\.sol$ ]]; then