declare spec deploy functions as required parameters

Author: ItsNickBarry

spec/access/ownable/Ownable.behavior.ts

@@ -5,13 +5,13 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
 export interface OwnableBehaviorArgs {
-  deploy: () => Promise<IOwnable>;
   getOwner: () => Promise<SignerWithAddress>;
   getNonOwner: () => Promise<SignerWithAddress>;
 }
 
 export function describeBehaviorOfOwnable(
-  { deploy, getOwner, getNonOwner }: OwnableBehaviorArgs,
+  deploy: () => Promise<IOwnable>,
+  { getOwner, getNonOwner }: OwnableBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);

spec/access/ownable/SafeOwnable.behavior.ts

@@ -6,14 +6,14 @@ import { expect } from 'chai';
 import { ethers } from 'ethers';
 
 export interface SafeOwnableBehaviorArgs {
-  deploy: () => Promise<ISafeOwnable>;
   getOwner: () => Promise<SignerWithAddress>;
   getNonOwner: () => Promise<SignerWithAddress>;
   getNomineeOwner: () => Promise<SignerWithAddress>;
 }
 
 export function describeBehaviorOfSafeOwnable(
-  { deploy, getOwner, getNomineeOwner, getNonOwner }: SafeOwnableBehaviorArgs,
+  deploy: () => Promise<ISafeOwnable>,
+  { getOwner, getNomineeOwner, getNonOwner }: SafeOwnableBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);
@@ -32,8 +32,8 @@ export function describeBehaviorOfSafeOwnable(
     });
 
     describeBehaviorOfOwnable(
+      deploy,
       {
-        deploy,
         getOwner,
         getNonOwner,
       },

spec/factory/CloneFactory.behavior.ts

@@ -1,10 +1,17 @@
 import { describeBehaviorOfFactory } from './Factory.behavior';
 import { describeFilter } from '@solidstate/library';
+import { BaseContract } from 'ethers';
 
-export function describeBehaviorOfCloneFactory({}, skips?: string[]) {
+export interface CloneFactoryBehaviorArgs {}
+
+export function describeBehaviorOfCloneFactory(
+  deploy: () => Promise<BaseContract>,
+  {}: CloneFactoryBehaviorArgs,
+  skips?: string[],
+) {
   const describe = describeFilter(skips);
 
   describe('::CloneFactory', function () {
-    describeBehaviorOfFactory({}, skips);
+    describeBehaviorOfFactory(deploy, {}, skips);
   });
 }

spec/factory/Factory.behavior.ts

@@ -1,6 +1,13 @@
 import { describeFilter } from '@solidstate/library';
+import { BaseContract } from 'ethers';
 
-export function describeBehaviorOfFactory({}, skips?: string[]) {
+export interface FactoryBehaviorArgs {}
+
+export function describeBehaviorOfFactory(
+  deploy: () => Promise<BaseContract>,
+  {}: FactoryBehaviorArgs,
+  skips?: string[],
+) {
   const describe = describeFilter(skips);
 
   describe('::Factory', function () {

spec/factory/MetamorphicFactory.behavior.ts

@@ -4,12 +4,11 @@ import { MetamorphicFactory } from '@solidstate/typechain-types';
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-export interface MetaphoricFactoryBehaviorArgs {
-  deploy: () => Promise<MetamorphicFactory>;
-}
+export interface MetaphoricFactoryBehaviorArgs {}
 
 export function describeBehaviorOfMetamorphicFactory(
-  { deploy }: MetaphoricFactoryBehaviorArgs,
+  deploy: () => Promise<MetamorphicFactory>,
+  {}: MetaphoricFactoryBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);
@@ -21,7 +20,7 @@ export function describeBehaviorOfMetamorphicFactory(
       instance = await deploy();
     });
 
-    describeBehaviorOfFactory({}, skips);
+    describeBehaviorOfFactory(deploy, {}, skips);
 
     describe('#getMetamorphicImplementation()', function () {
       // behavior changes during internal call but cannot be tested independently

spec/factory/MinimalProxyFactory.behavior.ts

@@ -1,10 +1,17 @@
 import { describeBehaviorOfFactory } from './Factory.behavior';
 import { describeFilter } from '@solidstate/library';
+import { BaseContract } from 'ethers';
 
-export function describeBehaviorOfMinimalProxyFactory({}, skips?: string[]) {
+export interface MinimalProxyFactoryBehaviorArgs {}
+
+export function describeBehaviorOfMinimalProxyFactory(
+  deploy: () => Promise<BaseContract>,
+  {}: MinimalProxyFactoryBehaviorArgs,
+  skips?: string[],
+) {
   const describe = describeFilter(skips);
 
   describe('::MinimalProxyFactory', function () {
-    describeBehaviorOfFactory({}, skips);
+    describeBehaviorOfFactory(deploy, {}, skips);
   });
 }

spec/introspection/ERC165.behavior.ts

@@ -3,12 +3,12 @@ import { IERC165 } from '@solidstate/typechain-types';
 import { expect } from 'chai';
 
 export interface ERC165BehaviorArgs {
-  deploy: () => Promise<IERC165>;
   interfaceIds: string[];
 }
 
 export function describeBehaviorOfERC165(
-  { deploy, interfaceIds }: ERC165BehaviorArgs,
+  deploy: () => Promise<IERC165>,
+  { interfaceIds }: ERC165BehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);

spec/multisig/ECDSAMultisigWallet.behavior.ts

@@ -40,16 +40,15 @@ const signAuthorization = async function (
 };
 
 export interface ECDSAMultisigWalletBehaviorArgs {
-  deploy: () => Promise<IECDSAMultisigWallet>;
   getSigners: () => Promise<SignerWithAddress[]>;
   getNonSigner: () => Promise<SignerWithAddress>;
   quorum: BigNumber;
   getVerificationAddress: () => Promise<string>;
 }
 
 export function describeBehaviorOfECDSAMultisigWallet(
+  deploy: () => Promise<IECDSAMultisigWallet>,
   {
-    deploy,
     getSigners,
     getNonSigner,
     quorum,

spec/proxy/Proxy.behavior.ts

@@ -4,17 +4,13 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
 export interface ProxyBehaviorArgs {
-  deploy: () => Promise<IProxy>;
   implementationFunction: string;
   implementationFunctionArgs: any[];
 }
 
 export function describeBehaviorOfProxy(
-  {
-    deploy,
-    implementationFunction,
-    implementationFunctionArgs,
-  }: ProxyBehaviorArgs,
+  deploy: () => Promise<IProxy>,
+  { implementationFunction, implementationFunctionArgs }: ProxyBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);

spec/proxy/diamond/SolidStateDiamond.behavior.ts

@@ -11,7 +11,6 @@ import { deployMockContract, MockContract } from 'ethereum-waffle';
 import { ethers } from 'hardhat';
 
 export interface SolidStateDiamondBehaviorArgs {
-  deploy: () => Promise<ISolidStateDiamond>;
   getOwner: () => Promise<SignerWithAddress>;
   getNomineeOwner: () => Promise<SignerWithAddress>;
   getNonOwner: () => Promise<SignerWithAddress>;
@@ -22,8 +21,8 @@ export interface SolidStateDiamondBehaviorArgs {
 }
 
 export function describeBehaviorOfSolidStateDiamond(
+  deploy: () => Promise<ISolidStateDiamond>,
   {
-    deploy,
     getOwner,
     getNomineeOwner,
     getNonOwner,
@@ -52,42 +51,42 @@ export function describeBehaviorOfSolidStateDiamond(
     });
 
     describeBehaviorOfDiamondBase(
+      deploy,
       {
-        deploy,
         facetFunction,
         facetFunctionArgs,
       },
       skips,
     );
 
     describeBehaviorOfDiamondReadable(
+      deploy,
       {
-        deploy,
         facetCuts,
       },
       skips,
     );
 
     describeBehaviorOfDiamondWritable(
+      deploy,
       {
-        deploy,
         getOwner,
         getNonOwner,
       },
       skips,
     );
 
     describeBehaviorOfERC165(
+      deploy,
       {
-        deploy,
         interfaceIds: ['0x7f5828d0'],
       },
       skips,
     );
 
     describeBehaviorOfSafeOwnable(
+      deploy,
       {
-        deploy,
         getOwner,
         getNomineeOwner,
         getNonOwner,

spec/proxy/diamond/base/DiamondBase.behavior.ts

@@ -4,13 +4,13 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
 export interface DiamondBaseBehaviorArgs {
-  deploy: () => Promise<IDiamondBase>;
   facetFunction: string;
   facetFunctionArgs: string[];
 }
 
 export function describeBehaviorOfDiamondBase(
-  { deploy, facetFunction, facetFunctionArgs }: DiamondBaseBehaviorArgs,
+  deploy: () => Promise<IDiamondBase>,
+  { facetFunction, facetFunctionArgs }: DiamondBaseBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);

spec/proxy/diamond/readable/DiamondReadable.behavior.ts

@@ -5,12 +5,12 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
 export interface DiamondReadableBehaviorArgs {
-  deploy: () => Promise<IDiamondReadable>;
   facetCuts: any[];
 }
 
 export function describeBehaviorOfDiamondReadable(
-  { deploy, facetCuts }: DiamondReadableBehaviorArgs,
+  deploy: () => Promise<IDiamondReadable>,
+  { facetCuts }: DiamondReadableBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);
@@ -24,8 +24,8 @@ export function describeBehaviorOfDiamondReadable(
     });
 
     describeBehaviorOfERC165(
+      deploy as any,
       {
-        deploy: deploy as any,
         interfaceIds: ['0x48e2b093'],
       },
       skips,

spec/proxy/diamond/writable/DiamondWritable.behavior.ts

@@ -7,13 +7,13 @@ import { deployMockContract } from 'ethereum-waffle';
 import { ethers } from 'hardhat';
 
 export interface DiamondWritableBehaviorArgs {
-  deploy: () => Promise<IDiamondWritable>;
   getOwner: () => Promise<SignerWithAddress>;
   getNonOwner: () => Promise<SignerWithAddress>;
 }
 
 export function describeBehaviorOfDiamondWritable(
-  { deploy, getOwner, getNonOwner }: DiamondWritableBehaviorArgs,
+  deploy: () => Promise<IDiamondWritable>,
+  { getOwner, getNonOwner }: DiamondWritableBehaviorArgs,
   skips?: string[],
 ) {
   const describe = describeFilter(skips);
@@ -55,8 +55,8 @@ export function describeBehaviorOfDiamondWritable(
     });
 
     describeBehaviorOfERC165(
+      deploy as any,
       {
-        deploy: deploy as any,
         interfaceIds: ['0x1f931c1c'],
       },
       skips,

spec/proxy/managed/ManagedProxy.behavior.ts

@@ -3,14 +3,13 @@ import { describeFilter } from '@solidstate/library';
 import { IManagedProxy } from '@solidstate/typechain-types';
 
 export interface ManagedProxyBehaviorArgs {
-  deploy: () => Promise<IManagedProxy>;
   implementationFunction: string;
   implementationFunctionArgs: any[];
 }
 
 export function describeBehaviorOfManagedProxy(
+  deploy: () => Promise<IManagedProxy>,
   {
-    deploy,
     implementationFunction,
     implementationFunctionArgs,
   }: ManagedProxyBehaviorArgs,
@@ -20,8 +19,8 @@ export function describeBehaviorOfManagedProxy(
 
   describe('::ManagedProxy', function () {
     describeBehaviorOfProxy(
+      deploy,
       {
-        deploy,
         implementationFunction,
         implementationFunctionArgs,
       },

spec/proxy/managed/ManagedProxyOwnable.behavior.ts

@@ -3,14 +3,13 @@ import { describeFilter } from '@solidstate/library';
 import { IManagedProxyOwnable } from '@solidstate/typechain-types';
 
 export interface ManagedProxyOwnableBehaviorArgs {
-  deploy: () => Promise<IManagedProxyOwnable>;
   implementationFunction: string;
   implementationFunctionArgs: any[];
 }
 
 export function describeBehaviorOfManagedProxyOwnable(
+  deploy: () => Promise<IManagedProxyOwnable>,
   {
-    deploy,
     implementationFunction,
     implementationFunctionArgs,
   }: ManagedProxyOwnableBehaviorArgs,
@@ -20,8 +19,8 @@ export function describeBehaviorOfManagedProxyOwnable(
 
   describe('::ManagedProxyOwnable', function () {
     describeBehaviorOfManagedProxy(
+      deploy,
       {
-        deploy,
         implementationFunction,
         implementationFunctionArgs,
       },

spec/proxy/upgradeable/UpgradeableProxy.behavior.ts

@@ -3,14 +3,13 @@ import { describeFilter } from '@solidstate/library';
 import { IUpgradeableProxy } from '@solidstate/typechain-types';
 
 export interface UpgradeableProxyBehaviorArgs {
-  deploy: () => Promise<IUpgradeableProxy>;
   implementationFunction: string;
   implementationFunctionArgs: any[];
 }
 
 export function describeBehaviorOfUpgradeableProxy(
+  deploy: () => Promise<IUpgradeableProxy>,
   {
-    deploy,
     implementationFunction,
     implementationFunctionArgs,
   }: UpgradeableProxyBehaviorArgs,
@@ -20,8 +19,8 @@ export function describeBehaviorOfUpgradeableProxy(
 
   describe('::UpgradeableProxy', function () {
     describeBehaviorOfProxy(
+      deploy,
       {
-        deploy,
         implementationFunction,
         implementationFunctionArgs,
       },