Merge pull request #1210 from dev-protocol/remove-always-caller

aggre · web-flow · commit 3724cd3f97b0 · 2023-07-15T11:48:07.000+09:00
Remove `always` wrapper
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -30,6 +30,12 @@
 		"functional/no-return-void": "off"
 	},
 	"overrides": [
+		{
+			"files": ["**/index.ts"],
+			"rules": {
+				"functional/functional-parameters": "off"
+			}
+		},
 		{
 			"files": ["**/*.spec.ts"],
 			"rules": {
diff --git a/lib/agent/fixtures/swap/index.ts b/lib/agent/fixtures/swap/index.ts
@@ -52,6 +52,6 @@ export const createSwapContract =
 			swapEthAndStakeDevCaller: createSwapEthAndStakeDevCaller(contract),
 			swapEthAndStakeDevPolygonCaller:
 				createSwapEthAndStakeDevPolygonCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/allocator/index.ts b/lib/ethereum/allocator/index.ts
@@ -1,7 +1,6 @@
 import { ContractRunner, ethers } from 'ethers'
 import { allocatorAbi } from './abi'
 import { createCalculateMaxRewardsPerBlockCaller } from './calculateMaxRewardsPerBlock'
-import { always } from 'ramda'
 
 export type CreateAllocatorContract = {
 	readonly calculateMaxRewardsPerBlock: () => Promise<string>
@@ -15,6 +14,6 @@ export const createAllocatorContract =
 		return {
 			calculateMaxRewardsPerBlock:
 				createCalculateMaxRewardsPerBlockCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/dev/index.ts b/lib/ethereum/dev/index.ts
@@ -12,7 +12,6 @@ import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { createDepositCaller } from './deposit'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type DevContract = {
 	readonly totalSupply: () => Promise<string>
@@ -52,6 +51,6 @@ export const createDevContract =
 			symbol: createSymbolCaller(contract),
 			decimals: createDecimalsCaller(contract),
 			deposit: createDepositCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/lockup/index.ts b/lib/ethereum/lockup/index.ts
@@ -17,7 +17,6 @@ import { createDepositToPositionCaller } from './depositToPosition'
 import { createMigrateToSTokensCaller } from './migrateToSTokens'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type LockupContract = {
 	readonly getValue: (
@@ -101,6 +100,6 @@ export const createLockupContract =
 			depositToProperty: createDepositToPropertyCaller(contract),
 			depositToPosition: createDepositToPositionCaller(contract),
 			migrateToSTokens: createMigrateToSTokensCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/market-behavior/index.ts b/lib/ethereum/market-behavior/index.ts
@@ -2,7 +2,6 @@ import { ContractRunner, ethers } from 'ethers'
 import { marketBehaviorAbi } from './abi'
 import { createGetIdCaller } from './getId'
 import { createGetMetricsCaller } from './getMetrics'
-import { always } from 'ramda'
 
 export type CreateMarketBehaviorContract = {
 	readonly getId: (metricsAddress: string) => Promise<string>
@@ -23,6 +22,6 @@ export const createMarketBehaviorContract =
 		return {
 			getId: createGetIdCaller(contract),
 			getMetrics: createGetMetricsCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/market-factory/index.ts b/lib/ethereum/market-factory/index.ts
@@ -3,7 +3,6 @@ import { marketFactoryAbi } from './abi'
 import { createCreateCaller } from './create'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type MarketFactoryContract = {
 	readonly create: (
@@ -23,6 +22,6 @@ export const createMarketFactoryContract =
 		)
 		return {
 			create: createCreateCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/metrics-group/index.ts b/lib/ethereum/metrics-group/index.ts
@@ -1,7 +1,6 @@
 import { ContractRunner, ethers } from 'ethers'
 import { metricsGroupAbi } from './abi'
 import { createTotalAuthenticatedPropertiesCaller } from './totalAuthenticatedProperties'
-import { always } from 'ramda'
 import { createTotalIssuedMetrics } from './totalIssuedMetrics'
 
 export type CreateMetricsGroupContract = {
@@ -23,6 +22,6 @@ export const createMetricsGroupContract =
 			totalAuthenticatedProperties:
 				createTotalAuthenticatedPropertiesCaller(contract),
 			totalIssuedMetrics: createTotalIssuedMetrics(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/metrics/index.ts b/lib/ethereum/metrics/index.ts
@@ -2,7 +2,6 @@ import { ContractRunner, ethers } from 'ethers'
 import { metricsAbi } from './abi'
 import { createPropertyCaller } from './property'
 import { createMarketCaller } from './market'
-import { always } from 'ramda'
 
 export type CreateMetricsContract = {
 	readonly property: () => Promise<string>
@@ -19,6 +18,6 @@ export const createMetricsContract =
 		return {
 			property: createPropertyCaller(contract),
 			market: createMarketCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/policy-factory/index.ts b/lib/ethereum/policy-factory/index.ts
@@ -4,7 +4,6 @@ import { createCreateCaller } from './create'
 import { createForceAttachCaller } from './forceAttach'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type PolicyFactoryContract = {
 	readonly create: (
@@ -33,6 +32,6 @@ export const createPolicyFactoryContract: CreatePolicyFactoryContract =
 		return {
 			create: createCreateCaller(contract),
 			forceAttach: createForceAttachCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/policy-group/index.ts b/lib/ethereum/policy-group/index.ts
@@ -1,7 +1,6 @@
 import { ContractRunner, ethers } from 'ethers'
 import { policyGroupAbi } from './abi'
 import { createIsGroupCaller } from './isGroup'
-import { always } from 'ramda'
 
 export type PolicyGroupContract = {
 	readonly isGroup: (policyAddress: string) => Promise<boolean>
@@ -19,6 +18,6 @@ export const createPolicyGroupContract: CreatePolicyGroupContract =
 		return {
 			isGroup: createIsGroupCaller(contract),
 			isDuringVotingPeriod: createIsGroupCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/policy/index.ts b/lib/ethereum/policy/index.ts
@@ -8,7 +8,6 @@ import { createPolicyVotingBlocksCaller } from './policyVotingBlocks'
 import { createShareOfTreasuryCaller } from './shareOfTreasury'
 import { createTreasuryCaller } from './treasury'
 import { createCapSetterCaller } from './capSetter'
-import { always } from 'ramda'
 
 export type PolicyContract = {
 	readonly holdersShare: (amount: string, lockups: string) => Promise<string>
@@ -39,6 +38,6 @@ export const createPolicyContract =
 			shareOfTreasury: createShareOfTreasuryCaller(contract),
 			treasury: createTreasuryCaller(contract),
 			capSetter: createCapSetterCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/property-factory/index.ts b/lib/ethereum/property-factory/index.ts
@@ -5,7 +5,6 @@ import { createCreatePropertyCaller } from './create'
 import { WaitForEventOptions } from '../market/authenticate'
 import { createCreateAndAuthenticateCaller } from './createAndAuthenticate'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import { always } from 'ramda'
 
 export type PropertyFactoryContract = {
 	readonly create: (
@@ -44,6 +43,6 @@ export const createPropertyFactoryContract =
 				contract,
 				provider,
 			),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/property/index.ts b/lib/ethereum/property/index.ts
@@ -15,7 +15,6 @@ import { createApproveCaller } from '../../common/erc20/approve'
 import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type PropertyContract = {
 	readonly totalSupply: () => Promise<string>
@@ -79,6 +78,6 @@ export const createPropertyContract: CreatePropertyContract =
 			changeAuthor: createChangeAuthorCaller(contract),
 			changeName: createChangeNameCaller(contract),
 			changeSymbol: createChangeSymbolCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/registry/index.ts b/lib/ethereum/registry/index.ts
@@ -17,7 +17,6 @@ import { createWithdrawStorageCaller } from './withdrawStorage'
 import { createPolicyFactoryCaller } from './policyFactory'
 import { createPolicySetCaller } from './policySet'
 import { createPolicyGroupCaller } from './policyGroup'
-import { always } from 'ramda'
 
 export type RegistryContract = {
 	readonly allocator: () => Promise<string>
@@ -71,6 +70,6 @@ export const createRegistryContract: CreateRegistryContract =
 			token: createTokenCaller(contract),
 			withdraw: createWithdrawCaller(contract),
 			withdrawStorage: createWithdrawStorageCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/ethereum/s-tokens/index.ts b/lib/ethereum/s-tokens/index.ts
@@ -14,7 +14,6 @@ import { createSetSTokenRoyaltyForPropertyCaller } from './setSTokenRoyaltyForPr
 import { createRoyaltyOfCaller } from './royaltyOf'
 import { createSetTokenURIDescriptorCaller } from './setTokenURIDescriptor'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 import { createTokenURISimCaller, TokenURISimProps } from './tokenURISim'
 import { FallbackableOverrides } from '../../common/utils/execute'
 
@@ -82,7 +81,7 @@ export const createSTokensContract =
 			payloadOf: createPayloadOfCaller(contractClient),
 			positionsOfProperty: createPositionsOfPropertyCaller(contractClient),
 			positionsOfOwner: createPositionsOfOwnerCaller(contractClient),
-			contract: always(contractClient),
+			contract: () => contractClient,
 		}
 	}
 
diff --git a/lib/ethereum/withdraw/index.ts b/lib/ethereum/withdraw/index.ts
@@ -7,7 +7,6 @@ import { createBulkWithdrawCaller } from './bulkWithdraw'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { calculateRewardAmountCaller } from './calculateRewardAmount'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import { always } from 'ramda'
 
 export type WithdrawContract = {
 	readonly withdraw: (
@@ -41,6 +40,6 @@ export const createWithdrawContract =
 			calculateWithdrawableAmount:
 				createCalculateWithdrawableAmountCaller(contract),
 			calculateRewardAmount: calculateRewardAmountCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/lockup/index.ts b/lib/l2/lockup/index.ts
@@ -15,7 +15,6 @@ import {
 	LockedupProperty,
 } from './getLockedupProperties'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 import { FallbackableOverrides } from '../../common/utils/execute'
 
 export type LockupContract = {
@@ -74,6 +73,6 @@ export const createLockupContract =
 			totalLocked: createTotalLockedCaller(contract),
 			totalLockedForProperty: createTotalLockedForPropertyCaller(contract),
 			getLockedupProperties: createGetLockedupPropertiesCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/market-factory/index.ts b/lib/l2/market-factory/index.ts
@@ -3,7 +3,6 @@ import { marketFactoryAbi } from './abi'
 import { createCreateCaller } from '../../ethereum/market-factory/create'
 import { createGetEnabledMarketsCaller } from './getEnabledMarkets'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type MarketFactoryContract = {
 	readonly create: (
@@ -24,6 +23,6 @@ export const createMarketFactoryContract =
 		return {
 			create: createCreateCaller(contract),
 			getEnabledMarkets: createGetEnabledMarketsCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/market/index.ts b/lib/l2/market/index.ts
@@ -8,7 +8,6 @@ import { createNameCaller } from './name'
 import { createBehaviorCaller } from '../../ethereum/market/behavior'
 import { createGetAuthenticatedPropertiesCaller } from './getAuthenticatedProperties'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import { always } from 'ramda'
 
 export type MarketContract = {
 	readonly schema: () => Promise<readonly string[]>
@@ -43,6 +42,6 @@ export const createMarketContract =
 			name: createNameCaller(contract),
 			getAuthenticatedProperties:
 				createGetAuthenticatedPropertiesCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/metrics-factory/index.ts b/lib/l2/metrics-factory/index.ts
@@ -3,7 +3,6 @@ import { metricsFactoryAbi } from './abi'
 import { createAuthenticatedPropertiesCountCaller } from './authenticatedPropertiesCount'
 import { createMetricsOfPropertyCaller } from './metricsOfProperty'
 import { createMetricsCountCaller } from './metricsCount'
-import { always } from 'ramda'
 
 export type MetricsFactoryContract = {
 	readonly authenticatedPropertiesCount: () => Promise<string>
@@ -29,6 +28,6 @@ export const createMetricsFactoryContract =
 				createAuthenticatedPropertiesCountCaller(contract),
 			metricsCount: createMetricsCountCaller(contract),
 			metricsOfProperty: createMetricsOfPropertyCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/policy/index.ts b/lib/l2/policy/index.ts
@@ -6,7 +6,6 @@ import { createAuthenticationFeeCaller } from '../../ethereum/policy/authenticat
 import { createMarketVotingSecondsCaller } from './marketVotingSeconds'
 import { createPolicyVotingSecondsCaller } from './policyVotingSeconds'
 import { createShareOfTreasuryCaller } from '../../ethereum/policy/shareOfTreasury'
-import { always } from 'ramda'
 
 export type PolicyContract = {
 	readonly holdersShare: (amount: string, lockups: string) => Promise<string>
@@ -33,6 +32,6 @@ export const createPolicyContract =
 			marketVotingSeconds: createMarketVotingSecondsCaller(contract),
 			policyVotingSeconds: createPolicyVotingSecondsCaller(contract),
 			shareOfTreasury: createShareOfTreasuryCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/property-factory/index.ts b/lib/l2/property-factory/index.ts
@@ -6,7 +6,6 @@ import { WaitForEventOptions } from '../../ethereum/market/authenticate'
 import { createCreateAndAuthenticateCaller } from './createAndAuthenticate'
 import { createGetPropertiesOfAuthorCaller } from './getPropertiesOfAuthor'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import { always } from 'ramda'
 
 export type PropertyFactoryContract = {
 	readonly create: (
@@ -47,6 +46,6 @@ export const createPropertyFactoryContract =
 				provider,
 			),
 			getPropertiesOfAuthor: createGetPropertiesOfAuthorCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/property/index.ts b/lib/l2/property/index.ts
@@ -15,7 +15,6 @@ import { createApproveCaller } from './../../common/erc20/approve'
 import { createAllowanceCaller } from './../../common/erc20/allowance'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { always } from 'ramda'
 
 export type PropertyContract = {
 	readonly totalSupply: () => Promise<string>
@@ -76,6 +75,6 @@ export const createPropertyContract: CreatePropertyContract =
 			changeName: createChangeNameCaller(contract),
 			changeSymbol: createChangeSymbolCaller(contract),
 			getBalances: createGetBalancesCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/lib/l2/registry/index.ts b/lib/l2/registry/index.ts
@@ -1,7 +1,6 @@
 import { ContractRunner, ethers } from 'ethers'
 import { addressRegistryAbi } from './abi'
 import { createRegistriesCaller } from './registries'
-import { always } from 'ramda'
 
 export type RegistryContract = {
 	readonly registries: (key: string) => Promise<string>
@@ -23,6 +22,6 @@ export const createRegistryContract: CreateRegistryContract =
 
 		return {
 			registries: createRegistriesCaller(contract),
-			contract: always(contract),
+			contract: () => contract,
 		}
 	}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@devprotocol/dev-kit",
 	"type": "module",
-	"version": "8.0.0",
+	"version": "8.0.1",
 	"description": "Dev Kit for JavaScript",
 	"author": "abyssparanoia",
 	"license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ export const createSwapContract =`
`52`	`52`	`swapEthAndStakeDevCaller: createSwapEthAndStakeDevCaller(contract),`
`53`	`53`	`swapEthAndStakeDevPolygonCaller:`
`54`	`54`	`createSwapEthAndStakeDevPolygonCaller(contract),`
`55`		`- contract: always(contract),`
	`55`	`+ contract: () => contract,`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { ContractRunner, ethers } from 'ethers'`
`2`	`2`	`import { allocatorAbi } from './abi'`
`3`	`3`	`import { createCalculateMaxRewardsPerBlockCaller } from './calculateMaxRewardsPerBlock'`
`4`		`-import { always } from 'ramda'`
`5`	`4`
`6`	`5`	`export type CreateAllocatorContract = {`
`7`	`6`	`readonly calculateMaxRewardsPerBlock: () => Promise<string>`
`@@ -15,6 +14,6 @@ export const createAllocatorContract =`
`15`	`14`	`return {`
`16`	`15`	`calculateMaxRewardsPerBlock:`
`17`	`16`	`createCalculateMaxRewardsPerBlockCaller(contract),`
`18`		`- contract: always(contract),`
	`17`	`+ contract: () => contract,`
`19`	`18`	`}`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import { createAllowanceCaller } from '../../common/erc20/allowance'`
`12`	`12`	`import { createDepositCaller } from './deposit'`
`13`	`13`	`import { FallbackableOverrides } from '../../common/utils/execute'`
`14`	`14`	`import { TransactionResponse } from '@ethersproject/abstract-provider'`
`15`		`-import { always } from 'ramda'`
`16`	`15`
`17`	`16`	`export type DevContract = {`
`18`	`17`	`readonly totalSupply: () => Promise<string>`
`@@ -52,6 +51,6 @@ export const createDevContract =`
`52`	`51`	`symbol: createSymbolCaller(contract),`
`53`	`52`	`decimals: createDecimalsCaller(contract),`
`54`	`53`	`deposit: createDepositCaller(contract),`
`55`		`- contract: always(contract),`
	`54`	`+ contract: () => contract,`
`56`	`55`	`}`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import { createDepositToPositionCaller } from './depositToPosition'`
`17`	`17`	`import { createMigrateToSTokensCaller } from './migrateToSTokens'`
`18`	`18`	`import { FallbackableOverrides } from '../../common/utils/execute'`
`19`	`19`	`import { TransactionResponse } from '@ethersproject/abstract-provider'`
`20`		`-import { always } from 'ramda'`
`21`	`20`
`22`	`21`	`export type LockupContract = {`
`23`	`22`	`readonly getValue: (`
`@@ -101,6 +100,6 @@ export const createLockupContract =`
`101`	`100`	`depositToProperty: createDepositToPropertyCaller(contract),`
`102`	`101`	`depositToPosition: createDepositToPositionCaller(contract),`
`103`	`102`	`migrateToSTokens: createMigrateToSTokensCaller(contract),`
`104`		`- contract: always(contract),`
	`103`	`+ contract: () => contract,`
`105`	`104`	`}`
`106`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import { ContractRunner, ethers } from 'ethers'`
`2`	`2`	`import { marketBehaviorAbi } from './abi'`
`3`	`3`	`import { createGetIdCaller } from './getId'`
`4`	`4`	`import { createGetMetricsCaller } from './getMetrics'`
`5`		`-import { always } from 'ramda'`
`6`	`5`
`7`	`6`	`export type CreateMarketBehaviorContract = {`
`8`	`7`	`readonly getId: (metricsAddress: string) => Promise<string>`
`@@ -23,6 +22,6 @@ export const createMarketBehaviorContract =`
`23`	`22`	`return {`
`24`	`23`	`getId: createGetIdCaller(contract),`
`25`	`24`	`getMetrics: createGetMetricsCaller(contract),`
`26`		`- contract: always(contract),`
	`25`	`+ contract: () => contract,`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ import { marketFactoryAbi } from './abi'`
`3`	`3`	`import { createCreateCaller } from './create'`
`4`	`4`	`import { FallbackableOverrides } from '../../common/utils/execute'`
`5`	`5`	`import { TransactionResponse } from '@ethersproject/abstract-provider'`
`6`		`-import { always } from 'ramda'`
`7`	`6`
`8`	`7`	`export type MarketFactoryContract = {`
`9`	`8`	`readonly create: (`
`@@ -23,6 +22,6 @@ export const createMarketFactoryContract =`
`23`	`22`	`)`
`24`	`23`	`return {`
`25`	`24`	`create: createCreateCaller(contract),`
`26`		`- contract: always(contract),`
	`25`	`+ contract: () => contract,`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { ContractRunner, ethers } from 'ethers'`
`2`	`2`	`import { metricsGroupAbi } from './abi'`
`3`	`3`	`import { createTotalAuthenticatedPropertiesCaller } from './totalAuthenticatedProperties'`
`4`		`-import { always } from 'ramda'`
`5`	`4`	`import { createTotalIssuedMetrics } from './totalIssuedMetrics'`
`6`	`5`
`7`	`6`	`export type CreateMetricsGroupContract = {`
`@@ -23,6 +22,6 @@ export const createMetricsGroupContract =`
`23`	`22`	`totalAuthenticatedProperties:`
`24`	`23`	`createTotalAuthenticatedPropertiesCaller(contract),`
`25`	`24`	`totalIssuedMetrics: createTotalIssuedMetrics(contract),`
`26`		`- contract: always(contract),`
	`25`	`+ contract: () => contract,`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import { ContractRunner, ethers } from 'ethers'`
`2`	`2`	`import { metricsAbi } from './abi'`
`3`	`3`	`import { createPropertyCaller } from './property'`
`4`	`4`	`import { createMarketCaller } from './market'`
`5`		`-import { always } from 'ramda'`
`6`	`5`
`7`	`6`	`export type CreateMetricsContract = {`
`8`	`7`	`readonly property: () => Promise<string>`
`@@ -19,6 +18,6 @@ export const createMetricsContract =`
`19`	`18`	`return {`
`20`	`19`	`property: createPropertyCaller(contract),`
`21`	`20`	`market: createMarketCaller(contract),`
`22`		`- contract: always(contract),`
	`21`	`+ contract: () => contract,`
`23`	`22`	`}`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import { createCreateCaller } from './create'`
`4`	`4`	`import { createForceAttachCaller } from './forceAttach'`
`5`	`5`	`import { FallbackableOverrides } from '../../common/utils/execute'`
`6`	`6`	`import { TransactionResponse } from '@ethersproject/abstract-provider'`
`7`		`-import { always } from 'ramda'`
`8`	`7`
`9`	`8`	`export type PolicyFactoryContract = {`
`10`	`9`	`readonly create: (`
`@@ -33,6 +32,6 @@ export const createPolicyFactoryContract: CreatePolicyFactoryContract =`
`33`	`32`	`return {`
`34`	`33`	`create: createCreateCaller(contract),`
`35`	`34`	`forceAttach: createForceAttachCaller(contract),`
`36`		`- contract: always(contract),`
	`35`	`+ contract: () => contract,`
`37`	`36`	`}`
`38`	`37`	`}`