hotfix: truffle; use _overrideConnectMethod in toInstance

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarity/hardhat-migrate",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "Automatic deployment and verification of smart contracts",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -35,7 +35,7 @@
     "prepack": "pinst --disable",
     "postpack": "pinst --enable",
     "build": "tsc --build .",
-    "test": "mocha --recursive 'test/**/*.ts' --exit",
+    "test": "mocha --recursive 'test/**/*.ts' --exit && npm run lint-fix",
     "lint-fix": "prettier --write \"./**/*.ts\" && eslint \"src/**/*.{js,ts}\" --cache --fix",
     "publish-to-npm": "npm run build && npm run lint-fix && npm publish ./ --access public"
   },

src/deployer/adapters/AbstractEthersAdapter.ts

@@ -50,14 +50,14 @@ export abstract class AbstractEthersAdapter extends Adapter {
     if (!AbstractEthersAdapter._processedClasses.has(contractName)) {
       AbstractEthersAdapter._processedClasses.add(contractName);
 
-      await this.overrideConnectMethod(instance, contractName);
+      await this._overrideConnectMethod(instance, contractName);
     }
 
     this._insertAddressGetter(contract, address);
-    return this.insertHandlers(contract, contractName, parameters) as unknown as I;
+    return this._insertHandlers(contract, contractName, parameters) as unknown as I;
   }
 
-  public insertHandlers(contract: BaseContract, contractName: string, parameters: OverridesAndLibs): BaseContract {
+  protected _insertHandlers(contract: BaseContract, contractName: string, parameters: OverridesAndLibs): BaseContract {
     const methodSet = new Set<string>();
 
     for (const methodFragments of this._getContractFunctionFragments(contract.interface)) {
@@ -97,7 +97,7 @@ export abstract class AbstractEthersAdapter extends Adapter {
     return contract;
   }
 
-  public abstract overrideConnectMethod<A, I>(instance: Factory<A, I>, contractName: string): Promise<void>;
+  protected abstract _overrideConnectMethod<A, I>(instance: Factory<A, I>, contractName: string): Promise<void>;
 
   private _insertAddressGetter(contract: BaseContract, contractAddress: string): void {
     contract.address = contractAddress;

src/deployer/adapters/BytecodeAdapter.ts

@@ -17,7 +17,7 @@ export class BytecodeAdapter extends AbstractEthersAdapter {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public async overrideConnectMethod(_instance: BytecodeFactory, _contractName: string) {
+  protected async _overrideConnectMethod(_instance: BytecodeFactory, _contractName: string) {
     return;
   }
 }

src/deployer/adapters/EthersContractAdapter.ts

@@ -31,15 +31,15 @@ export class EthersContractAdapter extends AbstractEthersAdapter {
     }
   }
 
-  public async overrideConnectMethod<A, I>(instance: EthersContract<A, I>, contractName: string) {
+  protected async _overrideConnectMethod<A, I>(instance: EthersContract<A, I>, contractName: string) {
     const connectMethod = instance.connect;
 
     const defaultRunner = await getSignerHelper();
 
     instance.connect = (address: string, runner?: ContractRunner): I => {
       const contract = connectMethod(address, runner ?? defaultRunner) as BaseContract;
 
-      return this.insertHandlers(contract, contractName, {}) as unknown as I;
+      return this._insertHandlers(contract, contractName, {}) as unknown as I;
     };
   }
 }

src/deployer/adapters/EthersFactoryAdapter.ts

@@ -20,13 +20,13 @@ export class EthersFactoryAdapter extends AbstractEthersAdapter {
     }
   }
 
-  public async overrideConnectMethod(instance: ContractFactory, contractName: string) {
+  protected async _overrideConnectMethod(instance: ContractFactory, contractName: string) {
     const attachMethod = instance.attach;
 
     instance.attach = (target: string | Addressable): any => {
       const contract = attachMethod(target);
 
-      return this.insertHandlers(contract, contractName, {});
+      return this._insertHandlers(contract, contractName, {});
     };
   }
 }

src/deployer/adapters/TruffleAdapter.ts

@@ -42,10 +42,11 @@ export class TruffleAdapter extends Adapter {
     );
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public async toInstance<I>(instance: TruffleFactory<I>, address: string, _parameters: OverridesAndLibs): Promise<I> {
+  public async toInstance<I>(instance: TruffleFactory<I>, address: string): Promise<I> {
     const contract = this._hre.artifacts.require(instance.contractName!);
 
+    await this._overrideConnectMethod(instance);
+
     return contract.at(address);
   }
 
@@ -73,7 +74,7 @@ export class TruffleAdapter extends Adapter {
     }
   }
 
-  public async overrideConnectMethod<I>(instance: TruffleFactory<I>) {
+  protected async _overrideConnectMethod<I>(instance: TruffleFactory<I>) {
     const atMethod = instance.at;
 
     instance.at = async (address: string): Promise<I> => {