Skip to content

Commit 31e45e8

Browse files
committed
fix name of IERC20Metadata interfaces
1 parent 7e6d487 commit 31e45e8

10 files changed

+19
-24
lines changed
File renamed without changes.

contracts/interfaces/IERC20MetadataStandard.sol contracts/interfaces/IERC20Metadata.sol

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
pragma solidity ^0.8.20;
44

5-
import { _IERC20MetadataStandard } from './_IERC20MetadataStandard.sol';
5+
import { _IERC20Metadata } from './_IERC20Metadata.sol';
66

7-
// TODO: improve name
8-
9-
interface IERC20MetadataStandard is _IERC20MetadataStandard {
7+
interface IERC20Metadata is _IERC20Metadata {
108
/**
119
* @notice return token name
1210
* @return token name

contracts/interfaces/IERC4626.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
pragma solidity ^0.8.20;
44

55
import { IERC20 } from './IERC20.sol';
6-
import { IERC20MetadataStandard } from './IERC20MetadataStandard.sol';
6+
import { IERC20Metadata } from './IERC20Metadata.sol';
77
import { _IERC4626 } from './_IERC4626.sol';
88

99
/**
1010
* @title ERC4626 interface
1111
* @dev see https://eips.ethereum.org/EIPS/eip-4626
1212
*/
13-
interface IERC4626 is _IERC4626, IERC20, IERC20MetadataStandard {
13+
interface IERC4626 is _IERC4626, IERC20, IERC20Metadata {
1414
/**
1515
* @notice get the address of the base token used for vault accountin purposes
1616
* @return base token address

contracts/interfaces/IWETH.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
pragma solidity ^0.8.20;
44

55
import { IERC20 } from './IERC20.sol';
6-
import { IERC20MetadataStandard } from './IERC20MetadataStandard.sol';
6+
import { IERC20Metadata } from './IERC20Metadata.sol';
77
import { _IWETH } from './_IWETH.sol';
88

99
/**
1010
* @title WETH (Wrapped ETH) interface
1111
*/
12-
interface IWETH is _IWETH, IERC20, IERC20MetadataStandard {
12+
interface IWETH is _IWETH, IERC20, IERC20Metadata {
1313
/**
1414
* @notice convert ETH to WETH
1515
*/

contracts/interfaces/_IERC20MetadataStandard.sol contracts/interfaces/_IERC20Metadata.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
pragma solidity ^0.8.20;
44

5-
interface _IERC20MetadataStandard {}
5+
interface _IERC20Metadata {}

contracts/interfaces/_IERC4626.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
pragma solidity ^0.8.20;
44

55
import { _IERC20 } from './_IERC20.sol';
6-
import { _IERC20MetadataStandard } from './_IERC20MetadataStandard.sol';
6+
import { _IERC20Metadata } from './_IERC20Metadata.sol';
77

88
/**
99
* @title Partial ERC4626 interface needed by internal functions
1010
*/
11-
interface _IERC4626 is _IERC20, _IERC20MetadataStandard {
11+
interface _IERC4626 is _IERC20, _IERC20Metadata {
1212
event Deposit(
1313
address indexed caller,
1414
address indexed owner,

contracts/interfaces/_IWETH.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
pragma solidity ^0.8.20;
44

55
import { _IERC20 } from './_IERC20.sol';
6-
import { _IERC20MetadataStandard } from './_IERC20MetadataStandard.sol';
6+
import { _IERC20Metadata } from './_IERC20Metadata.sol';
77

8-
interface _IWETH is _IERC20, _IERC20MetadataStandard {}
8+
interface _IWETH is _IERC20, _IERC20Metadata {}

contracts/token/fungible/metadata/FungibleTokenMetadata.sol

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pragma solidity ^0.8.20;
44

5-
import { IERC20MetadataStandard } from '../../../interfaces/IERC20MetadataStandard.sol';
5+
import { IERC20Metadata } from '../../../interfaces/IERC20Metadata.sol';
66
import { IFungibleTokenMetadata } from './IFungibleTokenMetadata.sol';
77
import { _FungibleTokenMetadata } from './_FungibleTokenMetadata.sol';
88

@@ -14,21 +14,21 @@ abstract contract FungibleTokenMetadata is
1414
_FungibleTokenMetadata
1515
{
1616
/**
17-
* @inheritdoc IERC20MetadataStandard
17+
* @inheritdoc IERC20Metadata
1818
*/
1919
function name() external view returns (string memory) {
2020
return _name();
2121
}
2222

2323
/**
24-
* @inheritdoc IERC20MetadataStandard
24+
* @inheritdoc IERC20Metadata
2525
*/
2626
function symbol() external view returns (string memory) {
2727
return _symbol();
2828
}
2929

3030
/**
31-
* @inheritdoc IERC20MetadataStandard
31+
* @inheritdoc IERC20Metadata
3232
*/
3333
function decimals() external view returns (uint8) {
3434
return _decimals();

contracts/token/fungible/metadata/IFungibleTokenMetadata.sol

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
pragma solidity ^0.8.20;
44

5-
import { IERC20MetadataStandard } from '../../../interfaces/IERC20MetadataStandard.sol';
5+
import { IERC20Metadata } from '../../../interfaces/IERC20Metadata.sol';
66
import { _IFungibleTokenMetadata } from './_IFungibleTokenMetadata.sol';
77

88
/**
99
* @title FungibleToken metadata interface
1010
*/
11-
interface IFungibleTokenMetadata is
12-
_IFungibleTokenMetadata,
13-
IERC20MetadataStandard
14-
{}
11+
interface IFungibleTokenMetadata is _IFungibleTokenMetadata, IERC20Metadata {}

contracts/token/fungible/metadata/_IFungibleTokenMetadata.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
pragma solidity ^0.8.20;
44

5-
import { _IERC20MetadataStandard } from '../../../interfaces/_IERC20MetadataStandard.sol';
5+
import { _IERC20Metadata } from '../../../interfaces/_IERC20Metadata.sol';
66

77
/**
88
* @title FungibleToken metadata internal interface
99
*/
10-
interface _IFungibleTokenMetadata is _IERC20MetadataStandard {}
10+
interface _IFungibleTokenMetadata is _IERC20Metadata {}

0 commit comments

Comments
 (0)