From 302bd90c2d1c4b14a3b3f4dfc3f0c8c76bad5fe2 Mon Sep 17 00:00:00 2001 From: kopy-kat Date: Wed, 10 Apr 2024 11:10:46 +0200 Subject: [PATCH] feat: remove check and rename checkN to check --- src/IRegistry.sol | 8 ++----- src/core/TrustManagerExternalAttesterList.sol | 18 ++------------ test/TrustDelegationExternal.t.sol | 24 ++++++++++--------- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/src/IRegistry.sol b/src/IRegistry.sol index a48bf739..599e91b0 100644 --- a/src/IRegistry.sol +++ b/src/IRegistry.sol @@ -46,13 +46,9 @@ interface IERC7484 { /* Check with external attester(s) */ /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/ - function check(address module, address attester) external view; + function check(address module, address[] calldata attesters, uint256 threshold) external view; - function check(address module, ModuleType moduleType, address attester) external view; - - function checkN(address module, address[] calldata attesters, uint256 threshold) external view; - - function checkN(address module, ModuleType moduleType, address[] calldata attesters, uint256 threshold) external view; + function check(address module, ModuleType moduleType, address[] calldata attesters, uint256 threshold) external view; } /** diff --git a/src/core/TrustManagerExternalAttesterList.sol b/src/core/TrustManagerExternalAttesterList.sol index aaf5ce8b..9fad7ebb 100644 --- a/src/core/TrustManagerExternalAttesterList.sol +++ b/src/core/TrustManagerExternalAttesterList.sol @@ -20,21 +20,7 @@ abstract contract TrustManagerExternalAttesterList is IRegistry, TrustManager { /** * @inheritdoc IERC7484 */ - function check(address module, address attester) external view { - $getAttestation(module, attester).enforceValid(ZERO_MODULE_TYPE); - } - - /** - * @inheritdoc IERC7484 - */ - function check(address module, ModuleType moduleType, address attester) external view { - $getAttestation(module, attester).enforceValid(moduleType); - } - - /** - * @inheritdoc IERC7484 - */ - function checkN(address module, address[] calldata attesters, uint256 threshold) external view { + function check(address module, address[] calldata attesters, uint256 threshold) external view { uint256 attestersLength = attesters.length; if (threshold == 0) threshold = attestersLength; else if (attestersLength < threshold) revert InsufficientAttestations(); @@ -51,7 +37,7 @@ abstract contract TrustManagerExternalAttesterList is IRegistry, TrustManager { /** * @inheritdoc IERC7484 */ - function checkN(address module, ModuleType moduleType, address[] calldata attesters, uint256 threshold) external view { + function check(address module, ModuleType moduleType, address[] calldata attesters, uint256 threshold) external view { uint256 attestersLength = attesters.length; if (threshold == 0) threshold = attestersLength; else if (attestersLength < threshold) revert InsufficientAttestations(); diff --git a/test/TrustDelegationExternal.t.sol b/test/TrustDelegationExternal.t.sol index c185d182..28e63921 100644 --- a/test/TrustDelegationExternal.t.sol +++ b/test/TrustDelegationExternal.t.sol @@ -20,24 +20,26 @@ contract TrustTestExternal is AttestationTest { function test_WhenSupplyingExternal() external whenSettingAttester { // It should set. _make_WhenUsingValidECDSA(attester1); + address[] memory trustedAttestersSingle = new address[](1); + trustedAttestersSingle[0] = address(attester1.addr); + address[] memory trustedAttesters = new address[](2); trustedAttesters[0] = address(attester1.addr); trustedAttesters[1] = address(attester2.addr); - registry.check(address(module1), ModuleType.wrap(1), attester1.addr); - registry.check(address(module1), ModuleType.wrap(2), attester1.addr); + registry.check(address(module1), ModuleType.wrap(1), trustedAttestersSingle, 1); + registry.check(address(module1), ModuleType.wrap(2), trustedAttestersSingle, 1); vm.expectRevert(); - registry.check(address(module1), ModuleType.wrap(3), attester1.addr); - registry.checkN(address(module1), trustedAttesters, 1); - registry.checkN(address(module1), ModuleType.wrap(1), trustedAttesters, 1); + registry.check(address(module1), ModuleType.wrap(3), trustedAttestersSingle, 1); + registry.check(address(module1), trustedAttesters, 1); + registry.check(address(module1), ModuleType.wrap(1), trustedAttesters, 1); vm.expectRevert(); - registry.checkN(address(module1), trustedAttesters, 2); + registry.check(address(module1), trustedAttesters, 2); vm.expectRevert(); - registry.checkN(address(module1), ModuleType.wrap(1), trustedAttesters, 2); + registry.check(address(module1), ModuleType.wrap(1), trustedAttesters, 2); _make_WhenUsingValidECDSA(attester2); - registry.checkN(address(module1), trustedAttesters, 2); - registry.checkN(address(module1), trustedAttesters, 2); - // registry.checkN(address(module1), ModuleType.wrap(1), trustedAttesters, 2); + registry.check(address(module1), trustedAttesters, 2); + registry.check(address(module1), trustedAttesters, 2); trustedAttesters = new address[](4); Account memory attester3 = makeAccount("attester3"); @@ -47,6 +49,6 @@ contract TrustTestExternal is AttestationTest { trustedAttesters[2] = address(attester4.addr); trustedAttesters[3] = address(attester2.addr); - registry.checkN(address(module1), trustedAttesters, 2); + registry.check(address(module1), trustedAttesters, 2); } }