Remove more buildler things

sc-forks · Apr 26, 2022 · 0ba3f11 · 0ba3f11
1 parent d57a131
commit 0ba3f11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 208 deletions.
diff --git a/plugins/buidler.plugin.js b/plugins/buidler.plugin.js
diff --git a/plugins/nomiclabs.plugin.js b/plugins/nomiclabs.plugin.js
@@ -1,6 +1 @@
-if (global && global.__hardhatContext){
-  require("./hardhat.plugin");
-  return;
-}
-
-module.exports = require('./buidler.plugin')
+require("./hardhat.plugin");
diff --git a/test/util/integration.js b/test/util/integration.js
@@ -13,11 +13,9 @@ const TruffleConfig = require('truffle-config');
 
 const { HARDHAT_NETWORK_NAME } = require("hardhat/plugins")
 const { resetHardhatContext } = require("hardhat/plugins-testing")
-const { resetBuidlerContext } = require("@nomiclabs/buidler/plugins-testing")
 
 const temp =              './sc_temp';
 const truffleConfigName = 'truffle-config.js';
-const buidlerConfigName = 'buidler.config.js';
 const hardhatConfigName = 'hardhat.config.js';
 const configPath =        `${temp}/.solcover.js`;
 const testPath =          './test/sources/js/';
@@ -35,7 +33,6 @@ function decacheConfigs(){
   const paths = [
     `${process.cwd()}/${temp}/.solcover.js`,
     `${process.cwd()}/${temp}/${truffleConfigName}`,
-    `${process.cwd()}/${temp}/${buidlerConfigName}`,
     `${process.cwd()}/${temp}/${hardhatConfigName}`,
     `${process.cwd()}/${temp}/contracts/Simple.sol`,
     `${process.cwd()}/${temp}/test/simple.js`,
@@ -72,16 +69,6 @@ function getOutput(config){
   return JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
 }
 
-// Buidler env set up
-function buidlerSetupEnv(mocha) {
-  const mockwd = path.join(process.cwd(), temp);
-  previousCWD = process.cwd();
-  process.chdir(mockwd);
-  mocha.env = require("@nomiclabs/buidler");
-  mocha.env.config.logger = testLogger
-  mocha.logger = testLogger
-};
-
 // Hardhat env set up
 function hardhatSetupEnv(mocha) {
   const mockwd = path.join(process.cwd(), temp);
@@ -92,12 +79,6 @@ function hardhatSetupEnv(mocha) {
   mocha.logger = testLogger
 };
 
-// Buidler env tear down
-function buidlerTearDownEnv() {
-  resetBuidlerContext();
-  process.chdir(previousCWD);
-};
-
 // Hardhat env tear down
 function hardhatTearDownEnv() {
   resetHardhatContext();
@@ -178,17 +159,6 @@ function getDefaultNomicLabsConfig(){
   return vals;
 }
 
-function getDefaultBuidlerConfig() {
-  const config = getDefaultNomicLabsConfig()
-  config.defaultNetwork = "buidlerevm";
-  config.solc = {
-    version: "0.7.3",
-    evmVersion: 'petersburg'
-  }
-
-  return config;
-}
-
 function getDefaultHardhatConfig() {
   const config = getDefaultNomicLabsConfig()
   config.defaultNetwork = HARDHAT_NETWORK_NAME;
@@ -198,22 +168,6 @@ function getDefaultHardhatConfig() {
   return config;
 }
 
-function getBuidlerConfigJS(config){
-  // Hardhat tests will crash if the buidler plugin is loaded from the shared entrypoint
-  // b/c of some kind of weird cacheing or context reset issue.
-  const prefix =`
-    const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-    loadPluginFile(__dirname + "/../plugins/buidler.plugin");
-    usePlugin("@nomiclabs/buidler-truffle5");
-  `
-
-  if (config) {
-    return `${prefix}module.exports = ${JSON.stringify(config, null, ' ')}`;
-  } else {
-    return `${prefix}module.exports = ${JSON.stringify(getDefaultBuidlerConfig(), null, ' ')}`;
-  }
-}
-
 function getHardhatConfigJS(config){
   const prefix =`
     require("@nomiclabs/hardhat-truffle5");
@@ -262,7 +216,7 @@ function deployDouble(contractNames){
 // Project Installers
 // ==========================
 /**
- * Installs mock truffle/buidler project at ./temp with a single contract
+ * Installs mock project at ./temp with a single contract
  * and test specified by the params.
  * @param  {String} contract <contractName.sol> located in /test/sources/cli/
  * @param  {[type]} test     <testName.js> located in /test/cli/
@@ -293,15 +247,14 @@ function install(
 
   // Configs
   fs.writeFileSync(`${temp}/${truffleConfigName}`, getTruffleConfigJS(devPlatformConfig));
-  fs.writeFileSync(`${temp}/${buidlerConfigName}`, getBuidlerConfigJS(devPlatformConfig));
   fs.writeFileSync(`${temp}/${hardhatConfigName}`, getHardhatConfigJS(devPlatformConfig));
   if(solcoverConfig) fs.writeFileSync(configPath, solcoverJS);
 
   decacheConfigs();
 };
 
 /**
- * Installs mock truffle/buidler project with two contracts (for inheritance, libraries, etc)
+ * Installs mock project with two contracts (for inheritance, libraries, etc)
  */
 function installDouble(contracts, test, config, skipMigration) {
   const configjs = getSolcoverJS(config);
@@ -328,15 +281,14 @@ function installDouble(contracts, test, config, skipMigration) {
 
   // Configs
   fs.writeFileSync(`${temp}/${truffleConfigName}`, getTruffleConfigJS());
-  fs.writeFileSync(`${temp}/${buidlerConfigName}`, getBuidlerConfigJS());
   fs.writeFileSync(`${temp}/${hardhatConfigName}`, getHardhatConfigJS());
   fs.writeFileSync(configPath, configjs);
 
   decacheConfigs();
 };
 
 /**
- * Installs full truffle/buidler project
+ * Installs full project
  */
 function installFullProject(name, config) {
   shell.mkdir(temp);
@@ -370,16 +322,13 @@ module.exports = {
   testLogger: testLogger,
   loggerOutput: loggerOutput,
   getDefaultTruffleConfig: getDefaultTruffleConfig,
-  getDefaultBuidlerConfig: getDefaultBuidlerConfig,
   getDefaultHardhatConfig: getDefaultHardhatConfig,
   install: install,
   installDouble: installDouble,
   installFullProject: installFullProject,
   clean: clean,
   pathToContract: pathToContract,
   getOutput: getOutput,
-  buidlerSetupEnv: buidlerSetupEnv,
-  buidlerTearDownEnv: buidlerTearDownEnv,
   hardhatSetupEnv: hardhatSetupEnv,
   hardhatTearDownEnv: hardhatTearDownEnv
 }