Skip to content

fix: improve code style and naming conventions #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaki9501 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: improve code style and naming conventions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions script/utils/Artifacts.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ struct Deployment {

abstract contract Artifacts {
/// @notice Foundry cheatcode VM.
Vm private constant _vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
Vm private constant VM = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));

string internal _deploymentOutFile;
mapping(string => Deployment) internal _namedDeployments;

function setUp() public virtual {
_deploymentOutFile =
string.concat(_vm.projectRoot(), "/deployments/", _vm.toString(block.chainid), "-deploy.json");
string.concat(VM.projectRoot(), "/deployments/", VM.toString(block.chainid), "-deploy.json");
_ensurePath(_deploymentOutFile);
console.log("Writing artifact to %s", _deploymentOutFile);

Expand Down Expand Up @@ -50,15 +50,15 @@ abstract contract Artifacts {
}

function _ensurePath(string memory path) private {
string[] memory outputs = _vm.split(path, "/");
string[] memory outputs = VM.split(path, "/");
string memory dir = "";
for (uint256 i = 0; i < outputs.length - 1; i++) {
dir = string.concat(dir, outputs[i], "/");
}
_vm.createDir(dir, true);
VM.createDir(dir, true);
}

function _appendDeployment(Deployment memory deployment) internal {
_vm.writeJson({json: stdJson.serialize("", deployment.name, deployment.addr), path: _deploymentOutFile});
VM.writeJson({json: stdJson.serialize("", deployment.name, deployment.addr), path: _deploymentOutFile});
}
}
8 changes: 4 additions & 4 deletions src/AttestationIndexer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ contract AttestationIndexer is UUPSUpgradeable, AccessControlUpgradeable, Pausab
mapping(
bytes32 schemaUid
=> mapping(address attester => mapping(address recipient => mapping(bytes32 key => bytes32 attestationUid)))
) private _rawDB;
) private rawDB;

/**
* @dev Locks the contract, preventing any future reinitialization. This
Expand Down Expand Up @@ -87,7 +87,7 @@ contract AttestationIndexer is UUPSUpgradeable, AccessControlUpgradeable, Pausab
view
returns (bytes32)
{
return _rawDB[schemaUid][attester][recipient][DEFAULT_KEY];
return rawDB[schemaUid][attester][recipient][DEFAULT_KEY];
}

/**
Expand All @@ -103,7 +103,7 @@ contract AttestationIndexer is UUPSUpgradeable, AccessControlUpgradeable, Pausab
view
returns (bytes32)
{
return _rawDB[schemaUid][attester][recipient][key];
return rawDB[schemaUid][attester][recipient][key];
}

/**
Expand Down Expand Up @@ -139,7 +139,7 @@ contract AttestationIndexer is UUPSUpgradeable, AccessControlUpgradeable, Pausab
Attestation memory attestation = _EAS.getAttestation(attestationUid);
attestation.verify();

_rawDB[attestation.schema][attestation.attester][attestation.recipient][key] = attestationUid;
rawDB[attestation.schema][attestation.attester][attestation.recipient][key] = attestationUid;
emit AttestationIndexed(attestation.schema, attestation.attester, attestation.recipient, key, attestation.uid);
}
}