Skip to content

Commit 52bb4af

Browse files
aliXsedaliXsed
committed
chore: fix misspellings
1 parent 5cdbad7 commit 52bb4af

5 files changed

Lines changed: 50 additions & 41 deletions

File tree

‎.cspell.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@
6060
"Frontends",
6161
"testuser",
6262
"testhandle",
63-
"douglasacost"
63+
"douglasacost",
64+
"IBEACON",
65+
"AABBCCDD",
66+
"SSTORE",
67+
"Permissionless",
68+
"Reentrancy",
69+
"SFID",
70+
"EXTCODECOPY",
71+
"solady",
72+
"SLOAD"
6473
]
6574
}

‎src/swarms/SwarmRegistryL1.sol‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,26 +194,26 @@ contract SwarmRegistryL1 is ReentrancyGuard {
194194

195195
/// @notice Reassigns the service provider. Resets status to REGISTERED. Caller must own the fleet NFT.
196196
/// @param swarmId The swarm to update.
197-
/// @param newproviderId New provider token ID.
198-
function updateSwarmProvider(uint256 swarmId, uint256 newproviderId) external {
197+
/// @param newProviderId New provider token ID.
198+
function updateSwarmProvider(uint256 swarmId, uint256 newProviderId) external {
199199
Swarm storage s = swarms[swarmId];
200200
if (s.filterPointer == address(0)) {
201201
revert SwarmNotFound();
202202
}
203203
if (FLEET_CONTRACT.ownerOf(s.fleetId) != msg.sender) {
204204
revert NotFleetOwner();
205205
}
206-
if (PROVIDER_CONTRACT.ownerOf(newproviderId) == address(0)) {
206+
if (PROVIDER_CONTRACT.ownerOf(newProviderId) == address(0)) {
207207
revert ProviderDoesNotExist();
208208
}
209209

210210
uint256 oldProvider = s.providerId;
211211

212-
s.providerId = newproviderId;
212+
s.providerId = newProviderId;
213213

214214
s.status = SwarmStatus.REGISTERED;
215215

216-
emit SwarmProviderUpdated(swarmId, oldProvider, newproviderId);
216+
emit SwarmProviderUpdated(swarmId, oldProvider, newProviderId);
217217
}
218218

219219
/// @notice Permanently deletes a swarm. Caller must own the fleet NFT.
@@ -257,7 +257,7 @@ contract SwarmRegistryL1 is ReentrancyGuard {
257257
}
258258
}
259259

260-
/// @notice Permissionlessly removes a swarm whose fleet or provider NFT has been burned.
260+
/// @notice Permissionless-ly removes a swarm whose fleet or provider NFT has been burned.
261261
/// @param swarmId The orphaned swarm to purge.
262262
function purgeOrphanedSwarm(uint256 swarmId) external {
263263
Swarm storage s = swarms[swarmId];
@@ -295,7 +295,7 @@ contract SwarmRegistryL1 is ReentrancyGuard {
295295
dataLen := extcodesize(pointer)
296296
}
297297

298-
// SSTORE2 adds 1 byte overhead (0x00), So actual data length = codesize - 1.
298+
// SSTORE2 adds 1 byte overhead (0x00), So actual data length = codeSize - 1.
299299
if (dataLen > 0) {
300300
unchecked {
301301
--dataLen;

‎src/swarms/SwarmRegistryUniversal.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,26 @@ contract SwarmRegistryUniversal is ReentrancyGuard {
203203

204204
/// @notice Reassigns the service provider. Resets status to REGISTERED. Caller must own the fleet NFT.
205205
/// @param swarmId The swarm to update.
206-
/// @param newproviderId New provider token ID.
207-
function updateSwarmProvider(uint256 swarmId, uint256 newproviderId) external {
206+
/// @param newProviderId New provider token ID.
207+
function updateSwarmProvider(uint256 swarmId, uint256 newProviderId) external {
208208
Swarm storage s = swarms[swarmId];
209209
if (s.filterLength == 0) {
210210
revert SwarmNotFound();
211211
}
212212
if (FLEET_CONTRACT.ownerOf(s.fleetId) != msg.sender) {
213213
revert NotFleetOwner();
214214
}
215-
if (PROVIDER_CONTRACT.ownerOf(newproviderId) == address(0)) {
215+
if (PROVIDER_CONTRACT.ownerOf(newProviderId) == address(0)) {
216216
revert ProviderDoesNotExist();
217217
}
218218

219219
uint256 oldProvider = s.providerId;
220220

221221
// Effects — update provider and reset status
222-
s.providerId = newproviderId;
222+
s.providerId = newProviderId;
223223
s.status = SwarmStatus.REGISTERED;
224224

225-
emit SwarmProviderUpdated(swarmId, oldProvider, newproviderId);
225+
emit SwarmProviderUpdated(swarmId, oldProvider, newProviderId);
226226
}
227227

228228
/// @notice Permanently deletes a swarm. Caller must own the fleet NFT.
@@ -267,7 +267,7 @@ contract SwarmRegistryUniversal is ReentrancyGuard {
267267
}
268268
}
269269

270-
/// @notice Permissionlessly removes a swarm whose fleet or provider NFT has been burned.
270+
/// @notice Permissionless-ly removes a swarm whose fleet or provider NFT has been burned.
271271
/// @param swarmId The orphaned swarm to purge.
272272
function purgeOrphanedSwarm(uint256 swarmId) external {
273273
Swarm storage s = swarms[swarmId];

‎test/SwarmRegistryL1.t.sol‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ contract SwarmRegistryL1Test is Test {
1313

1414
address fleetOwner = address(0x1);
1515
address providerOwner = address(0x2);
16-
address rando = address(0x3);
16+
address caller = address(0x3);
1717

1818
event SwarmRegistered(uint256 indexed swarmId, uint256 indexed fleetId, uint256 indexed providerId, address owner);
1919
event SwarmStatusChanged(uint256 indexed swarmId, SwarmRegistryL1.SwarmStatus status);
@@ -43,14 +43,14 @@ contract SwarmRegistryL1Test is Test {
4343
}
4444

4545
function _registerSwarm(
46-
address caller,
46+
address owner,
4747
uint256 fleetId,
4848
uint256 providerId,
4949
bytes memory filter,
5050
uint8 fpSize,
5151
SwarmRegistryL1.TagType tagType
5252
) internal returns (uint256) {
53-
vm.prank(caller);
53+
vm.prank(owner);
5454
return swarmRegistry.registerSwarm(fleetId, providerId, filter, fpSize, tagType);
5555
}
5656

@@ -228,7 +228,7 @@ contract SwarmRegistryL1Test is Test {
228228
function test_RevertIf_registerSwarm_notFleetOwner() public {
229229
uint256 fleetId = _registerFleet(fleetOwner, "my-fleet");
230230

231-
vm.prank(rando);
231+
vm.prank(caller);
232232
vm.expectRevert(SwarmRegistryL1.NotFleetOwner.selector);
233233
swarmRegistry.registerSwarm(fleetId, 1, new bytes(10), 16, SwarmRegistryL1.TagType.GENERIC);
234234
}
@@ -331,7 +331,7 @@ contract SwarmRegistryL1Test is Test {
331331
uint256 swarmId =
332332
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryL1.TagType.GENERIC);
333333

334-
vm.prank(rando);
334+
vm.prank(caller);
335335
vm.expectRevert(SwarmRegistryL1.NotProviderOwner.selector);
336336
swarmRegistry.acceptSwarm(swarmId);
337337
}
@@ -564,7 +564,7 @@ contract SwarmRegistryL1Test is Test {
564564
uint256 swarmId =
565565
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryL1.TagType.GENERIC);
566566

567-
vm.prank(rando);
567+
vm.prank(caller);
568568
vm.expectRevert(SwarmRegistryL1.NotFleetOwner.selector);
569569
swarmRegistry.updateSwarmFilter(swarmId, new bytes(100));
570570
}
@@ -636,7 +636,7 @@ contract SwarmRegistryL1Test is Test {
636636
uint256 swarmId =
637637
_registerSwarm(fleetOwner, fleetId, providerId1, new bytes(50), 8, SwarmRegistryL1.TagType.GENERIC);
638638

639-
vm.prank(rando);
639+
vm.prank(caller);
640640
vm.expectRevert(SwarmRegistryL1.NotFleetOwner.selector);
641641
swarmRegistry.updateSwarmProvider(swarmId, providerId2);
642642
}
@@ -731,7 +731,7 @@ contract SwarmRegistryL1Test is Test {
731731
uint256 swarmId =
732732
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryL1.TagType.GENERIC);
733733

734-
vm.prank(rando);
734+
vm.prank(caller);
735735
vm.expectRevert(SwarmRegistryL1.NotFleetOwner.selector);
736736
swarmRegistry.deleteSwarm(swarmId);
737737
}
@@ -859,9 +859,9 @@ contract SwarmRegistryL1Test is Test {
859859

860860
// Anyone can purge
861861
vm.expectEmit(true, true, true, true);
862-
emit SwarmPurged(swarmId, fleetId, rando);
862+
emit SwarmPurged(swarmId, fleetId, caller);
863863

864-
vm.prank(rando);
864+
vm.prank(caller);
865865
swarmRegistry.purgeOrphanedSwarm(swarmId);
866866

867867
// Swarm should be zeroed
@@ -879,7 +879,7 @@ contract SwarmRegistryL1Test is Test {
879879
vm.prank(fleetOwner);
880880
fleetContract.burn(fleetId);
881881

882-
vm.prank(rando);
882+
vm.prank(caller);
883883
swarmRegistry.purgeOrphanedSwarm(swarmId);
884884

885885
(,, address pointer,,,) = swarmRegistry.swarms(swarmId);
@@ -898,7 +898,7 @@ contract SwarmRegistryL1Test is Test {
898898
vm.prank(providerOwner);
899899
providerContract.burn(p1);
900900

901-
vm.prank(rando);
901+
vm.prank(caller);
902902
swarmRegistry.purgeOrphanedSwarm(s1);
903903

904904
// s2 should be swapped to index 0
@@ -993,7 +993,7 @@ contract SwarmRegistryL1Test is Test {
993993
vm.prank(providerOwner);
994994
providerContract.burn(providerId);
995995

996-
vm.prank(rando);
996+
vm.prank(caller);
997997
swarmRegistry.purgeOrphanedSwarm(swarmId);
998998

999999
// After purge, swarm no longer exists

‎test/SwarmRegistryUniversal.t.sol‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ contract SwarmRegistryUniversalTest is Test {
1313

1414
address fleetOwner = address(0x1);
1515
address providerOwner = address(0x2);
16-
address rando = address(0x3);
16+
address caller = address(0x3);
1717

1818
event SwarmRegistered(
1919
uint256 indexed swarmId, uint256 indexed fleetId, uint256 indexed providerId, address owner, uint32 filterSize
@@ -45,14 +45,14 @@ contract SwarmRegistryUniversalTest is Test {
4545
}
4646

4747
function _registerSwarm(
48-
address caller,
48+
address owner,
4949
uint256 fleetId,
5050
uint256 providerId,
5151
bytes memory filter,
5252
uint8 fpSize,
5353
SwarmRegistryUniversal.TagType tagType
5454
) internal returns (uint256) {
55-
vm.prank(caller);
55+
vm.prank(owner);
5656
return swarmRegistry.registerSwarm(fleetId, providerId, filter, fpSize, tagType);
5757
}
5858

@@ -251,7 +251,7 @@ contract SwarmRegistryUniversalTest is Test {
251251
function test_RevertIf_registerSwarm_notFleetOwner() public {
252252
uint256 fleetId = _registerFleet(fleetOwner, "my-fleet");
253253

254-
vm.prank(rando);
254+
vm.prank(caller);
255255
vm.expectRevert(SwarmRegistryUniversal.NotFleetOwner.selector);
256256
swarmRegistry.registerSwarm(fleetId, 1, new bytes(10), 16, SwarmRegistryUniversal.TagType.GENERIC);
257257
}
@@ -363,7 +363,7 @@ contract SwarmRegistryUniversalTest is Test {
363363
uint256 swarmId =
364364
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryUniversal.TagType.GENERIC);
365365

366-
vm.prank(rando);
366+
vm.prank(caller);
367367
vm.expectRevert(SwarmRegistryUniversal.NotProviderOwner.selector);
368368
swarmRegistry.acceptSwarm(swarmId);
369369
}
@@ -663,7 +663,7 @@ contract SwarmRegistryUniversalTest is Test {
663663
uint256 swarmId =
664664
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryUniversal.TagType.GENERIC);
665665

666-
vm.prank(rando);
666+
vm.prank(caller);
667667
vm.expectRevert(SwarmRegistryUniversal.NotFleetOwner.selector);
668668
swarmRegistry.updateSwarmFilter(swarmId, new bytes(100));
669669
}
@@ -735,7 +735,7 @@ contract SwarmRegistryUniversalTest is Test {
735735
uint256 swarmId =
736736
_registerSwarm(fleetOwner, fleetId, providerId1, new bytes(50), 8, SwarmRegistryUniversal.TagType.GENERIC);
737737

738-
vm.prank(rando);
738+
vm.prank(caller);
739739
vm.expectRevert(SwarmRegistryUniversal.NotFleetOwner.selector);
740740
swarmRegistry.updateSwarmProvider(swarmId, providerId2);
741741
}
@@ -852,7 +852,7 @@ contract SwarmRegistryUniversalTest is Test {
852852
uint256 swarmId =
853853
_registerSwarm(fleetOwner, fleetId, providerId, new bytes(50), 8, SwarmRegistryUniversal.TagType.GENERIC);
854854

855-
vm.prank(rando);
855+
vm.prank(caller);
856856
vm.expectRevert(SwarmRegistryUniversal.NotFleetOwner.selector);
857857
swarmRegistry.deleteSwarm(swarmId);
858858
}
@@ -976,9 +976,9 @@ contract SwarmRegistryUniversalTest is Test {
976976
providerContract.burn(providerId);
977977

978978
vm.expectEmit(true, true, true, true);
979-
emit SwarmPurged(swarmId, fleetId, rando);
979+
emit SwarmPurged(swarmId, fleetId, caller);
980980

981-
vm.prank(rando);
981+
vm.prank(caller);
982982
swarmRegistry.purgeOrphanedSwarm(swarmId);
983983

984984
(,, uint32 filterLength,,,) = swarmRegistry.swarms(swarmId);
@@ -994,7 +994,7 @@ contract SwarmRegistryUniversalTest is Test {
994994
vm.prank(fleetOwner);
995995
fleetContract.burn(fleetId);
996996

997-
vm.prank(rando);
997+
vm.prank(caller);
998998
swarmRegistry.purgeOrphanedSwarm(swarmId);
999999

10001000
(uint256 fId,, uint32 filterLength,,,) = swarmRegistry.swarms(swarmId);
@@ -1014,7 +1014,7 @@ contract SwarmRegistryUniversalTest is Test {
10141014
vm.prank(providerOwner);
10151015
providerContract.burn(p1);
10161016

1017-
vm.prank(rando);
1017+
vm.prank(caller);
10181018
swarmRegistry.purgeOrphanedSwarm(s1);
10191019

10201020
// s2 should be swapped to index 0
@@ -1038,7 +1038,7 @@ contract SwarmRegistryUniversalTest is Test {
10381038
vm.prank(providerOwner);
10391039
providerContract.burn(providerId);
10401040

1041-
vm.prank(rando);
1041+
vm.prank(caller);
10421042
swarmRegistry.purgeOrphanedSwarm(swarmId);
10431043

10441044
// filterLength should be cleared
@@ -1129,7 +1129,7 @@ contract SwarmRegistryUniversalTest is Test {
11291129
vm.prank(providerOwner);
11301130
providerContract.burn(providerId);
11311131

1132-
vm.prank(rando);
1132+
vm.prank(caller);
11331133
swarmRegistry.purgeOrphanedSwarm(swarmId);
11341134

11351135
// After purge, swarm no longer exists

0 commit comments

Comments
 (0)