Commit 46b93231 authored by Will Cory's avatar Will Cory

nuke ownable from contract

parent 7f063877
...@@ -30,7 +30,6 @@ contract AssetReceiverTest is AssetReceiver_Initializer { ...@@ -30,7 +30,6 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
function test_attest_single() external { function test_attest_single() external {
AttestationStation attestationStation = new AttestationStation(); AttestationStation attestationStation = new AttestationStation();
attestationStation.initialize();
// alice is going to attest about bob // alice is going to attest about bob
AttestationStation.AttestationData memory attestationData = AttestationStation AttestationStation.AttestationData memory attestationData = AttestationStation
......
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pragma solidity 0.8.15; pragma solidity 0.8.15;
import {
OwnableUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import { Semver } from "@eth-optimism/contracts-bedrock/contracts/universal/Semver.sol"; import { Semver } from "@eth-optimism/contracts-bedrock/contracts/universal/Semver.sol";
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
contract AttestationStation is Initializable, OwnableUpgradeable, Semver { contract AttestationStation is Initializable, Semver {
struct AttestationData { struct AttestationData {
address about; address about;
bytes32 key; bytes32 key;
...@@ -23,18 +20,7 @@ contract AttestationStation is Initializable, OwnableUpgradeable, Semver { ...@@ -23,18 +20,7 @@ contract AttestationStation is Initializable, OwnableUpgradeable, Semver {
bytes val bytes val
); );
constructor(address owner) Semver(0, 0, 1) { constructor() Semver(0, 0, 1) {}
initialize(owner);
}
/**
* @notice Initialize the Optimist contract.
* @dev Initializes the AttestationStation contract with msg.sender as owner
*/
function initialize(address owner) public initializer {
__Ownable_init();
transferOwnership(owner);
}
/** /**
* @notice Attest to the given data. * @notice Attest to the given data.
......
...@@ -16,7 +16,6 @@ remappings = [ ...@@ -16,7 +16,6 @@ remappings = [
'@rari-capital/solmate/=node_modules/@rari-capital/solmate', '@rari-capital/solmate/=node_modules/@rari-capital/solmate',
'forge-std/=node_modules/forge-std/src', 'forge-std/=node_modules/forge-std/src',
'ds-test/=node_modules/ds-test/src', 'ds-test/=node_modules/ds-test/src',
'@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
'@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/', '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
'@eth-optimism/contracts-bedrock/=node_modules/@eth-optimism/contracts-bedrock', '@eth-optimism/contracts-bedrock/=node_modules/@eth-optimism/contracts-bedrock',
] ]
......
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
"@nomiclabs/hardhat-waffle": "^2.0.3", "@nomiclabs/hardhat-waffle": "^2.0.3",
"@rari-capital/solmate": "7.0.0-alpha.3", "@rari-capital/solmate": "7.0.0-alpha.3",
"@openzeppelin/contracts": "4.6.0", "@openzeppelin/contracts": "4.6.0",
"@openzeppelin/contracts-upgradeable": "4.8.0",
"@types/chai": "^4.2.18", "@types/chai": "^4.2.18",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/node": "^17.0.21", "@types/node": "^17.0.21",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment