Skip to content

Change application variable visibility #135

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

Merged
hujw77 merged 1 commit into from
Mar 12, 2024
Merged

Change application variable visibility #135

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
8 changes: 4 additions & 4 deletions src/user/Application.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ import "../interfaces/IORMP.sol";
import "./AppBase.sol";

abstract contract Application is AppBase {
address public immutable ORMP;
address private immutable _ORMP;

constructor(address ormp) {
ORMP = ormp;
_ORMP = ormp;
}

function ormpSender() public view virtual override returns (address) {
return ORMP;
return _ORMP;
}

function ormpRecver() public view virtual override returns (address) {
return ORMP;
}

function _setAppConfig(address oracle, address relayer) internal virtual {
IORMP(ORMP).setAppConfig(oracle, relayer);
IORMP(_ORMP).setAppConfig(oracle, relayer);
}
}
20 changes: 10 additions & 10 deletions src/user/UpgradeableApplication.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,40 @@ import "../interfaces/IORMP.sol";
import "./AppBase.sol";

abstract contract UpgradeableApplication is AppBase {
address public sender;
address public recver;
address private sender;
address private recver;

event SetSender(address ormp);
event SetRecver(address ormp);

constructor(address ormp) {
sender = ormp;
recver = ormp;
_sender = ormp;
_recver = ormp;
}

function ormpSender() public view virtual override returns (address) {
return sender;
return _sender;
}

function ormpRecver() public view virtual override returns (address) {
return recver;
return _recver;
}

function _setSender(address ormp) internal virtual {
sender = ormp;
_sender = ormp;
emit SetSender(ormp);
}

function _setRecver(address ormp) internal virtual {
recver = ormp;
_recver = ormp;
emit SetRecver(ormp);
}

function _setSenderConfig(address oracle, address relayer) internal virtual {
IORMP(sender).setAppConfig(oracle, relayer);
IORMP(ormpSender()).setAppConfig(oracle, relayer);
}

function _setRecverConfig(address oracle, address relayer) internal virtual {
IORMP(recver).setAppConfig(oracle, relayer);
IORMP(ormpRecver()).setAppConfig(oracle, relayer);
}
}