Skip to content

Commit 5ef5fe9

Browse files
tmigonetmigone
committed
chore: lint and replace some imports
Signed-off-by: Tomás Migone <tomas@edgeandnode.com>
1 parent 2c94da4 commit 5ef5fe9

13 files changed

Lines changed: 81 additions & 71 deletions

File tree

‎packages/horizon/contracts/mocks/ControllerMock.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
pragma solidity 0.8.27;
44

5-
import { IController } from "@graphprotocol/contracts/contracts/governance/IController.sol";
6-
import { IManaged } from "@graphprotocol/contracts/contracts/governance/IManaged.sol";
5+
import { IController } from "@graphprotocol/interfaces/contracts/contracts/governance/IController.sol";
6+
import { IManaged } from "@graphprotocol/interfaces/contracts/contracts/governance/IManaged.sol";
77

88
/**
99
* @title Graph Controller contract (mock)

‎packages/horizon/contracts/mocks/EpochManagerMock.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pragma solidity 0.8.27;
44

5-
import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
5+
import { IEpochManager } from "@graphprotocol/interfaces/contracts/contracts/epochs/IEpochManager.sol";
66

77
contract EpochManagerMock is IEpochManager {
88
// -- Variables --

‎packages/horizon/contracts/staking/HorizonStakingExtension.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pragma solidity 0.8.27;
44

5-
import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
5+
import { ICuration } from "@graphprotocol/interfaces/contracts/contracts/curation/ICuration.sol";
66
import { IGraphToken } from "@graphprotocol/contracts/contracts/token/IGraphToken.sol";
77
import {
88
IHorizonStakingExtension

‎packages/horizon/contracts/utilities/GraphDirectory.sol‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { IHorizonStaking } from "@graphprotocol/interfaces/contracts/horizon/IHo
77
import { IGraphPayments } from "@graphprotocol/interfaces/contracts/horizon/IGraphPayments.sol";
88
import { IPaymentsEscrow } from "@graphprotocol/interfaces/contracts/horizon/IPaymentsEscrow.sol";
99

10-
import { IController } from "@graphprotocol/contracts/contracts/governance/IController.sol";
11-
import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
12-
import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
13-
import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol";
10+
import { IController } from "@graphprotocol/interfaces/contracts/contracts/governance/IController.sol";
11+
import { IEpochManager } from "@graphprotocol/interfaces/contracts/contracts/epochs/IEpochManager.sol";
12+
import { IRewardsManager } from "@graphprotocol/interfaces/contracts/contracts/rewards/IRewardsManager.sol";
13+
import { ITokenGateway } from "@graphprotocol/interfaces/contracts/contracts/arbitrum/ITokenGateway.sol";
1414
import { IGraphProxyAdmin } from "@graphprotocol/interfaces/contracts/contracts/upgrades/IGraphProxyAdmin.sol";
1515

16-
import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
16+
import { ICuration } from "@graphprotocol/interfaces/contracts/contracts/curation/ICuration.sol";
1717

1818
/**
1919
* @title GraphDirectory contract

‎packages/horizon/test/unit/utilities/GraphDirectoryImplementation.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
pragma solidity 0.8.27;
44

5-
import { IGraphToken } from "@graphprotocol/contracts/contracts/token/IGraphToken.sol";
5+
import { IGraphToken } from "@graphprotocol/interfaces/contracts/contracts/token/IGraphToken.sol";
66
import { IHorizonStaking } from "@graphprotocol/interfaces/contracts/horizon/IHorizonStaking.sol";
77
import { IGraphPayments } from "@graphprotocol/interfaces/contracts/horizon/IGraphPayments.sol";
88
import { IPaymentsEscrow } from "@graphprotocol/interfaces/contracts/horizon/IPaymentsEscrow.sol";
99

10-
import { IController } from "@graphprotocol/contracts/contracts/governance/IController.sol";
11-
import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
12-
import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
13-
import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol";
10+
import { IController } from "@graphprotocol/interfaces/contracts/contracts/governance/IController.sol";
11+
import { IEpochManager } from "@graphprotocol/interfaces/contracts/contracts/epochs/IEpochManager.sol";
12+
import { IRewardsManager } from "@graphprotocol/interfaces/contracts/contracts/rewards/IRewardsManager.sol";
13+
import { ITokenGateway } from "@graphprotocol/interfaces/contracts/contracts/arbitrum/ITokenGateway.sol";
1414
import { IGraphProxyAdmin } from "@graphprotocol/interfaces/contracts/contracts/upgrades/IGraphProxyAdmin.sol";
15-
import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
15+
import { ICuration } from "@graphprotocol/interfaces/contracts/contracts/curation/ICuration.sol";
1616

1717
import { GraphDirectory } from "./../../../contracts/utilities/GraphDirectory.sol";
1818

‎packages/interfaces/contracts/contracts/governance/IGoverned.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ interface IGoverned {
1616

1717
/**
1818
* @notice Admin function to begin change of governor.
19-
* @param _newGovernor Address of new `governor`
19+
* @param newGovernor Address of new `governor`
2020
*/
21-
function transferOwnership(address _newGovernor) external;
21+
function transferOwnership(address newGovernor) external;
2222

2323
/**
2424
* @notice Admin function for pending governor to accept role and update governor.

‎packages/interfaces/contracts/toolshed/ISubgraphServiceToolshed.sol‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ import { IProvisionManager } from "./internal/IProvisionManager.sol";
99
import { IProvisionTracker } from "./internal/IProvisionTracker.sol";
1010
import { IDataServicePausable } from "../data-service/IDataServicePausable.sol";
1111

12-
interface ISubgraphServiceToolshed is ISubgraphService, IOwnable, IPausable, IDataServicePausable, ILegacyAllocation, IProvisionManager, IProvisionTracker {
12+
interface ISubgraphServiceToolshed is
13+
ISubgraphService,
14+
IOwnable,
15+
IPausable,
16+
IDataServicePausable,
17+
ILegacyAllocation,
18+
IProvisionManager,
19+
IProvisionTracker
20+
{
1321
/**
1422
* @notice Gets the indexer details
1523
* @dev Note that this storage getter actually returns a ISubgraphService.Indexer struct, but ethers v6 is not
@@ -19,7 +27,9 @@ interface ISubgraphServiceToolshed is ISubgraphService, IOwnable, IPausable, IDa
1927
* @return url The URL where the indexer can be reached at for queries
2028
* @return geoHash The indexer's geo location, expressed as a geo hash
2129
*/
22-
function indexers(address indexer) external view returns (uint256 registeredAt, string memory url, string memory geoHash);
30+
function indexers(
31+
address indexer
32+
) external view returns (uint256 registeredAt, string memory url, string memory geoHash);
2333

2434
/**
2535
* @notice Gets the allocation provision tracker

‎packages/interfaces/src/types/horizon.ts‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import type {
2-
IControllerToolshed,
3-
IEpochManagerToolshed,
4-
IGNSToolshed,
5-
IGraphPayments,
6-
IGraphProxyAdmin,
7-
IGraphTallyCollectorToolshed,
8-
IGraphToken,
9-
IHorizonStakingToolshed,
10-
IL2CurationToolshed,
11-
IPaymentsEscrowToolshed,
12-
IRewardsManagerToolshed,
13-
IStaking,
14-
ISubgraphNFT,
15-
} from '../../types'
2+
IControllerToolshed,
3+
IEpochManagerToolshed,
4+
IGNSToolshed,
5+
IGraphPayments,
6+
IGraphProxyAdmin,
7+
IGraphTallyCollectorToolshed,
8+
IGraphToken,
9+
IHorizonStakingToolshed,
10+
IL2CurationToolshed,
11+
IPaymentsEscrowToolshed,
12+
IRewardsManagerToolshed,
13+
IStaking,
14+
ISubgraphNFT,
15+
} from '../../types'
1616

17-
export {
18-
IControllerToolshed as Controller,
19-
IEpochManagerToolshed as EpochManager,
20-
IGraphPayments as GraphPayments,
21-
IGraphProxyAdmin as GraphProxyAdmin,
22-
IGraphTallyCollectorToolshed as GraphTallyCollector,
23-
IHorizonStakingToolshed as HorizonStaking,
24-
IL2CurationToolshed as L2Curation,
25-
IGNSToolshed as L2GNS,
26-
IGraphToken as L2GraphToken,
27-
IStaking as LegacyStaking,
28-
IPaymentsEscrowToolshed as PaymentsEscrow,
29-
IRewardsManagerToolshed as RewardsManager,
30-
ISubgraphNFT as SubgraphNFT,
31-
}
17+
export {
18+
IControllerToolshed as Controller,
19+
IEpochManagerToolshed as EpochManager,
20+
IGraphPayments as GraphPayments,
21+
IGraphProxyAdmin as GraphProxyAdmin,
22+
IGraphTallyCollectorToolshed as GraphTallyCollector,
23+
IHorizonStakingToolshed as HorizonStaking,
24+
IL2CurationToolshed as L2Curation,
25+
IGNSToolshed as L2GNS,
26+
IGraphToken as L2GraphToken,
27+
IStaking as LegacyStaking,
28+
IPaymentsEscrowToolshed as PaymentsEscrow,
29+
IRewardsManagerToolshed as RewardsManager,
30+
ISubgraphNFT as SubgraphNFT,
31+
}

‎packages/interfaces/src/types/subgraph-service.ts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import type {
2-
IDisputeManager, // typechain builds contracts interface as IDisputeManager
3-
IDisputeManagerToolshed, // typechain doesn't build this interface so we toolshed-it
4-
IGNSToolshed,
5-
IL2CurationToolshed,
6-
IServiceRegistryToolshed,
7-
ISubgraphNFT,
8-
ISubgraphServiceToolshed,
9-
} from '../../types'
10-
11-
// These are just type re-declarations to keep naming conventions consistent
12-
export {
13-
IDisputeManagerToolshed as DisputeManager,
14-
IL2CurationToolshed as L2Curation,
15-
IGNSToolshed as L2GNS,
16-
IDisputeManager as LegacyDisputeManager,
17-
IServiceRegistryToolshed as LegacyServiceRegistry,
18-
ISubgraphNFT as SubgraphNFT,
19-
ISubgraphServiceToolshed as SubgraphService,
20-
}
2+
IDisputeManager, // typechain builds contracts interface as IDisputeManager
3+
IDisputeManagerToolshed, // typechain doesn't build this interface so we toolshed-it
4+
IGNSToolshed,
5+
IL2CurationToolshed,
6+
IServiceRegistryToolshed,
7+
ISubgraphNFT,
8+
ISubgraphServiceToolshed,
9+
} from '../../types'
10+
11+
// These are just type re-declarations to keep naming conventions consistent
12+
export {
13+
IDisputeManagerToolshed as DisputeManager,
14+
IL2CurationToolshed as L2Curation,
15+
IGNSToolshed as L2GNS,
16+
IDisputeManager as LegacyDisputeManager,
17+
IServiceRegistryToolshed as LegacyServiceRegistry,
18+
ISubgraphNFT as SubgraphNFT,
19+
ISubgraphServiceToolshed as SubgraphService,
20+
}

‎packages/subgraph-service/contracts/utilities/Directory.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity 0.8.27;
44
import { IDisputeManager } from "@graphprotocol/interfaces/contracts/subgraph-service/IDisputeManager.sol";
55
import { ISubgraphService } from "@graphprotocol/interfaces/contracts/subgraph-service/ISubgraphService.sol";
66
import { IGraphTallyCollector } from "@graphprotocol/interfaces/contracts/horizon/IGraphTallyCollector.sol";
7-
import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
7+
import { ICuration } from "@graphprotocol/interfaces/contracts/contracts/curation/ICuration.sol";
88

99
/**
1010
* @title Directory contract

0 commit comments

Comments
 (0)