Skip to content

Commit 10c3719

Browse files
kopy-katkopy-kat
committed
fix: change moduleAddr to moduleAddress in tests
1 parent d792ff4 commit 10c3719

6 files changed

+33
-26
lines changed

‎test/Attestation.t.sol

+13-13
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ contract AttestationTest is BaseTest {
2323
for (uint256 i; i < types.length; i++) {
2424
typesEnc[i] = ModuleType.wrap(types[i]);
2525
}
26-
request = AttestationRequest({ moduleAddr: module, expirationTime: expirationTime, data: data, moduleTypes: typesEnc });
26+
request = AttestationRequest({ moduleAddress: module, expirationTime: expirationTime, data: data, moduleTypes: typesEnc });
2727
}
2828

2929
function mockRevocation(address module) internal pure returns (RevocationRequest memory request) {
30-
request = RevocationRequest({ moduleAddr: module });
30+
request = RevocationRequest({ moduleAddress: module });
3131
}
3232

3333
function test_WhenAttestingWithNoAttestationData() public prankWithAccount(attester1) {
@@ -41,7 +41,7 @@ contract AttestationTest is BaseTest {
4141

4242
assertEq(record.time, block.timestamp);
4343
assertEq(record.expirationTime, request.expirationTime);
44-
assertEq(record.moduleAddr, request.moduleAddr);
44+
assertEq(record.moduleAddress, request.moduleAddress);
4545
assertEq(record.attester, attester1.addr);
4646
}
4747

@@ -59,7 +59,7 @@ contract AttestationTest is BaseTest {
5959

6060
assertEq(record.time, block.timestamp);
6161
assertEq(record.expirationTime, requests[0].expirationTime);
62-
assertEq(record.moduleAddr, requests[0].moduleAddr);
62+
assertEq(record.moduleAddress, requests[0].moduleAddress);
6363
assertEq(record.attester, attester1.addr);
6464
}
6565

@@ -143,12 +143,12 @@ contract AttestationTest is BaseTest {
143143

144144
assertEq(record[0].time, block.timestamp);
145145
assertEq(record[0].expirationTime, requests[0].expirationTime);
146-
assertEq(record[0].moduleAddr, requests[0].moduleAddr);
146+
assertEq(record[0].moduleAddress, requests[0].moduleAddress);
147147
assertEq(record[0].attester, attester1.addr);
148148

149149
assertEq(record[1].time, block.timestamp);
150150
assertEq(record[1].expirationTime, requests[0].expirationTime);
151-
assertEq(record[1].moduleAddr, requests[0].moduleAddr);
151+
assertEq(record[1].moduleAddress, requests[0].moduleAddress);
152152
assertEq(record[1].attester, attester2.addr);
153153
}
154154

@@ -164,10 +164,10 @@ contract AttestationTest is BaseTest {
164164
assertEq(record.time, block.timestamp);
165165
assertEq(record.expirationTime, request.expirationTime);
166166
assertEq(record.revocationTime, 0);
167-
assertEq(record.moduleAddr, request.moduleAddr);
167+
assertEq(record.moduleAddress, request.moduleAddress);
168168
assertEq(record.attester, attester1.addr);
169169

170-
RevocationRequest memory revocation = RevocationRequest({ moduleAddr: module });
170+
RevocationRequest memory revocation = RevocationRequest({ moduleAddress: module });
171171

172172
vm.warp(block.timestamp + 100);
173173
registry.revoke(revocation);
@@ -183,7 +183,7 @@ contract AttestationTest is BaseTest {
183183
assertEq(record.expirationTime, request.expirationTime);
184184
// ensure revocation time is reset
185185
assertEq(record.revocationTime, 0);
186-
assertEq(record.moduleAddr, request.moduleAddr);
186+
assertEq(record.moduleAddress, request.moduleAddress);
187187
assertEq(record.attester, attester1.addr);
188188
}
189189

@@ -303,7 +303,7 @@ contract AttestationTest is BaseTest {
303303

304304
assertEq(record.time, block.timestamp);
305305
assertEq(record.expirationTime, request.expirationTime);
306-
assertEq(record.moduleAddr, request.moduleAddr);
306+
assertEq(record.moduleAddress, request.moduleAddress);
307307
assertEq(record.attester, attester.addr);
308308
assertEq(nonceAfter, nonceBefore + 1);
309309
assertEq(PackedModuleTypes.unwrap(record.moduleTypes), 2 ** 1 + 2 ** 2);
@@ -347,7 +347,7 @@ contract AttestationTest is BaseTest {
347347

348348
assertEq(record.time, block.timestamp);
349349
assertEq(record.expirationTime, requests[0].expirationTime);
350-
assertEq(record.moduleAddr, requests[0].moduleAddr);
350+
assertEq(record.moduleAddress, requests[0].moduleAddress);
351351
assertEq(record.attester, attester1.addr);
352352
assertEq(nonceAfter, nonceBefore + 1);
353353
}
@@ -389,7 +389,7 @@ contract AttestationTest is BaseTest {
389389

390390
assertEq(record.time, block.timestamp);
391391
assertEq(record.expirationTime, request.expirationTime);
392-
assertEq(record.moduleAddr, request.moduleAddr);
392+
assertEq(record.moduleAddress, request.moduleAddress);
393393
assertEq(record.attester, address(erc1271AttesterTrue));
394394
}
395395

@@ -406,7 +406,7 @@ contract AttestationTest is BaseTest {
406406

407407
assertEq(record.time, block.timestamp);
408408
assertEq(record.expirationTime, requests[0].expirationTime);
409-
assertEq(record.moduleAddr, requests[0].moduleAddr);
409+
assertEq(record.moduleAddress, requests[0].moduleAddress);
410410
assertEq(record.attester, address(erc1271AttesterTrue));
411411
}
412412

‎test/Base.t.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ contract BaseTest is Test {
101101
registry.registerModule(differentResolverUID, address(module3), "", "");
102102

103103
AttestationRequest memory req = AttestationRequest({
104-
moduleAddr: address(module1),
104+
moduleAddress: address(module1),
105105
expirationTime: uint48(block.timestamp + 100_000),
106106
data: "0x",
107107
moduleTypes: new ModuleType[](0)

‎test/Factory.t.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ contract FactoryTest is BaseTest {
2323
bytes32 salt = 0x05a40beaf368eb6b2bc5665901a885c044c19346fc828ba80a35fe4cc30d0000;
2424

2525
vm.startPrank(address(0x05a40beAF368EB6b2bc5665901a885C044C19346));
26-
address moduleAddr = registry.calcModuleAddress(salt, type(MockModuleFoo).creationCode);
26+
address moduleAddress = registry.calcModuleAddress(salt, type(MockModuleFoo).creationCode);
2727

2828
address deployedAddr = registry.deployModule(salt, defaultResolverUID, type(MockModuleFoo).creationCode, "", "");
2929
vm.stopPrank();
30-
assertTrue(moduleAddr == deployedAddr);
30+
assertTrue(moduleAddress == deployedAddr);
3131
}
3232
}

‎test/ModuleRegistration.t.sol

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ contract ModuleRegistrationTest is BaseTest {
2222

2323
bytes memory bytecode = type(MockModule).creationCode;
2424

25-
address moduleAddr = registry.deployModule(salt, defaultResolverUID, bytecode, "", "");
26-
ModuleRecord memory record = registry.findModule(moduleAddr);
25+
address moduleAddress = registry.deployModule(salt, defaultResolverUID, bytecode, "", "");
26+
ModuleRecord memory record = registry.findModule(moduleAddress);
2727
assertTrue(record.resolverUID == defaultResolverUID);
2828
}
2929

@@ -33,10 +33,10 @@ contract ModuleRegistrationTest is BaseTest {
3333
bytes memory bytecode = type(MockModuleWithArgs).creationCode;
3434
bytes memory initCode = abi.encodePacked(bytecode, abi.encode(313_131));
3535

36-
address moduleAddr = registry.deployModule(salt, defaultResolverUID, initCode, "", "");
36+
address moduleAddress = registry.deployModule(salt, defaultResolverUID, initCode, "", "");
3737

3838
address moduleAddrCalc = registry.calcModuleAddress(salt, initCode);
39-
assertTrue(moduleAddr == moduleAddrCalc);
39+
assertTrue(moduleAddress == moduleAddrCalc);
4040
}
4141

4242
function test_WhenRegisteringAModuleOnAnInvalidResolverUID() external prankWithAccount(moduleDev1) {

‎test/invariance/Handler.t.sol

+12-5
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,18 @@ contract Handler is CommonBase, StdCheats, StdUtils {
6262
SchemaRecord memory record = REGISTRY.findSchema(uid);
6363
}
6464

65-
function handle_registerModule(uint256 randomResolverNr, address moduleAddr, bytes calldata bytecode, bytes calldata metadata) public {
66-
vm.etch(moduleAddr, bytecode);
65+
function handle_registerModule(
66+
uint256 randomResolverNr,
67+
address moduleAddress,
68+
bytes calldata bytecode,
69+
bytes calldata metadata
70+
)
71+
public
72+
{
73+
vm.etch(moduleAddress, bytecode);
6774
ResolverUID uid = _pickRandomResolverUID(randomResolverNr);
6875

69-
REGISTRY.registerModule(uid, moduleAddr, metadata, "");
76+
REGISTRY.registerModule(uid, moduleAddress, metadata, "");
7077
}
7178

7279
function _pickTypes() private pure returns (ModuleType[] memory ret) {
@@ -88,7 +95,7 @@ contract Handler is CommonBase, StdCheats, StdUtils {
8895
bound(request.expirationTime, block.timestamp + 1, type(uint48).max);
8996
request.moduleTypes = _pickTypes();
9097

91-
handle_registerModule(randResolve, request.moduleAddr, bytecode, metadata);
98+
handle_registerModule(randResolve, request.moduleAddress, bytecode, metadata);
9299
SchemaUID uid = _pickRandomSchemaUID(randomSchemaUID);
93100

94101
REGISTRY.attest(uid, request);
@@ -106,7 +113,7 @@ contract Handler is CommonBase, StdCheats, StdUtils {
106113
// for (uint256 i = 0; i < requests.length; i++) {
107114
// bound(requests[i].expirationTime, block.timestamp + 1, type(uint48).max);
108115
// requests[i].moduleTypes = _pickTypes();
109-
// handle_registerModule(randResolve, requests[i].moduleAddr, bytecode, metadata);
116+
// handle_registerModule(randResolve, requests[i].moduleAddress, bytecode, metadata);
110117
// }
111118
//
112119
SchemaUID uid = _pickRandomSchemaUID(randomSchemaUID);

‎test/invariance/invariant_ImmutableData.t.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ contract ImmutableData is BaseTest {
3737
function invariant_attestation_immutable() public {
3838
AttestationRecord memory record = registry.findAttestation(address(module1), invarAttester.addr);
3939
assertTrue(record.dataPointer == defaultDataRef);
40-
assertEq(record.moduleAddr, address(module1));
40+
assertEq(record.moduleAddress, address(module1));
4141
assertEq(record.attester, invarAttester.addr);
4242
assertTrue(record.attester != address(0));
4343
}

0 commit comments

Comments
 (0)