Skip to content

Commit

Permalink
fix: moar feedback fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Tomás Migone <[email protected]>
  • Loading branch information
@tmigone
tmigone committed Jun 7, 2024
1 parent 99c273e commit 1741ea2
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 52 deletions.
26 changes: 0 additions & 26 deletions packages/horizon/contracts/interfaces/IBridgeEscrow.sol
View file

This file was deleted.

1 change: 1 addition & 0 deletions packages/horizon/contracts/libraries/Denominations.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ pragma solidity 0.8.26;
*/
library Denominations {
/// @notice The address of the native token, i.e ETH
/// @dev This convention is taken from https://eips.ethereum.org/EIPS/eip-7528
address internal constant NATIVE_TOKEN = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;

/**
Expand Down
15 changes: 0 additions & 15 deletions packages/horizon/contracts/utilities/GraphDirectory.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { IController } from "@graphprotocol/contracts/contracts/governance/ICont
import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol";
import { IBridgeEscrow } from "../interfaces/IBridgeEscrow.sol";
import { IGraphProxyAdmin } from "../interfaces/IGraphProxyAdmin.sol";

import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";
Expand Down Expand Up @@ -52,9 +51,6 @@ abstract contract GraphDirectory {
/// @notice The Token Gateway contract address
ITokenGateway private immutable GRAPH_TOKEN_GATEWAY;

/// @notice The Bridge Escrow contract address
IBridgeEscrow private immutable GRAPH_BRIDGE_ESCROW;

/// @notice The Graph Proxy Admin contract address
IGraphProxyAdmin private immutable GRAPH_PROXY_ADMIN;

Expand All @@ -73,7 +69,6 @@ abstract contract GraphDirectory {
* @param graphEpochManager The Epoch Manager contract address
* @param graphRewardsManager The Rewards Manager contract address
* @param graphTokenGateway The Token Gateway contract address
* @param graphBridgeEscrow The Bridge Escrow contract address
* @param graphProxyAdmin The Graph Proxy Admin contract address
* @param graphCuration The Curation contract address
*/
Expand All @@ -86,7 +81,6 @@ abstract contract GraphDirectory {
address graphEpochManager,
address graphRewardsManager,
address graphTokenGateway,
address graphBridgeEscrow,
address graphProxyAdmin,
address graphCuration
);
Expand Down Expand Up @@ -118,7 +112,6 @@ abstract contract GraphDirectory {
GRAPH_EPOCH_MANAGER = IEpochManager(_getContractFromController("EpochManager"));
GRAPH_REWARDS_MANAGER = IRewardsManager(_getContractFromController("RewardsManager"));
GRAPH_TOKEN_GATEWAY = ITokenGateway(_getContractFromController("GraphTokenGateway"));
GRAPH_BRIDGE_ESCROW = IBridgeEscrow(_getContractFromController("BridgeEscrow"));
GRAPH_PROXY_ADMIN = IGraphProxyAdmin(_getContractFromController("GraphProxyAdmin"));
GRAPH_CURATION = ICuration(_getContractFromController("Curation"));

Expand All @@ -131,7 +124,6 @@ abstract contract GraphDirectory {
address(GRAPH_EPOCH_MANAGER),
address(GRAPH_REWARDS_MANAGER),
address(GRAPH_TOKEN_GATEWAY),
address(GRAPH_BRIDGE_ESCROW),
address(GRAPH_PROXY_ADMIN),
address(GRAPH_CURATION)
);
Expand Down Expand Up @@ -193,13 +185,6 @@ abstract contract GraphDirectory {
return GRAPH_TOKEN_GATEWAY;
}

/**
* @notice Get the Bridge Escrow contract
*/
function _graphBridgeEscrow() internal view returns (IBridgeEscrow) {
return GRAPH_BRIDGE_ESCROW;
}

/**
* @notice Get the Graph Proxy Admin contract
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/eslint.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ module.exports = [
},
},
{
ignores: ['typechain-types/*'],
ignores: ['typechain-types/*', 'lib/*'],
},
]
2 changes: 1 addition & 1 deletion packages/horizon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@graphprotocol/horizon",
"version": "0.0.1",
"description": "",
"author": "The Graph Team",
"author": "The Graph core devs",
"license": "GPL-2.0-or-later",
"scripts": {
"lint:ts": "eslint '**/*.{js,ts}' --fix",
Expand Down
1 change: 0 additions & 1 deletion packages/horizon/test/GraphBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ abstract contract GraphBaseTest is Utils, Constants {
controller.setContractProxy(keccak256("RewardsManager"), address(rewardsManager));
controller.setContractProxy(keccak256("Curation"), address(curation));
controller.setContractProxy(keccak256("GraphTokenGateway"), makeAddr("GraphTokenGateway"));
controller.setContractProxy(keccak256("BridgeEscrow"), makeAddr("BridgeEscrow"));
controller.setContractProxy(keccak256("GraphProxyAdmin"), address(proxyAdmin));

resetPrank(users.deployer);
Expand Down
2 changes: 0 additions & 2 deletions packages/horizon/test/utilities/GraphDirectory.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ contract GraphDirectoryTest is GraphBaseTest {
_getContractFromController("EpochManager"),
_getContractFromController("RewardsManager"),
_getContractFromController("GraphTokenGateway"),
_getContractFromController("BridgeEscrow"),
_getContractFromController("GraphProxyAdmin"),
_getContractFromController("Curation")
);
Expand Down Expand Up @@ -49,7 +48,6 @@ contract GraphDirectoryTest is GraphBaseTest {
assertEq(_getContractFromController("EpochManager"), address(directory.graphEpochManager()));
assertEq(_getContractFromController("RewardsManager"), address(directory.graphRewardsManager()));
assertEq(_getContractFromController("GraphTokenGateway"), address(directory.graphTokenGateway()));
assertEq(_getContractFromController("BridgeEscrow"), address(directory.graphBridgeEscrow()));
assertEq(_getContractFromController("GraphProxyAdmin"), address(directory.graphProxyAdmin()));
assertEq(_getContractFromController("Curation"), address(directory.graphCuration()));
}
Expand Down
5 changes: 0 additions & 5 deletions packages/horizon/test/utilities/GraphDirectoryImplementation.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { IController } from "@graphprotocol/contracts/contracts/governance/ICont
import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol";
import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol";
import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol";
import { IBridgeEscrow } from "../../contracts/interfaces/IBridgeEscrow.sol";
import { IGraphProxyAdmin } from "../../contracts/interfaces/IGraphProxyAdmin.sol";
import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol";

Expand Down Expand Up @@ -55,10 +54,6 @@ contract GraphDirectoryImplementation is GraphDirectory {
return _graphTokenGateway();
}

function graphBridgeEscrow() external view returns (IBridgeEscrow) {
return _graphBridgeEscrow();
}

function graphProxyAdmin() external view returns (IGraphProxyAdmin) {
return _graphProxyAdmin();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/subgraph-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@graphprotocol/subgraph-service",
"version": "0.0.1",
"description": "",
"author": "The Graph Team",
"author": "The Graph core devs",
"license": "GPL-2.0-or-later",
"scripts": {
"lint:ts": "eslint '**/*.{js,ts}' --fix",
Expand Down

0 comments on commit 1741ea2

Please sign in to comment.