From dc3084836fe62e44e00b5ffef950a2f8173304ba Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Mon, 10 Feb 2025 11:14:00 +0100 Subject: [PATCH] vault: prefix errors with 'Vault' --- contracts/vault/VaultBase.sol | 46 +++++++++++++++++------------------ test/Vault.tests.js | 4 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contracts/vault/VaultBase.sol b/contracts/vault/VaultBase.sol index 494e50d..4605be2 100644 --- a/contracts/vault/VaultBase.sol +++ b/contracts/vault/VaultBase.sol @@ -69,7 +69,7 @@ abstract contract VaultBase { Timestamp maximum ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.NoLock, FundAlreadyLocked()); + require(lock.status() == LockStatus.NoLock, VaultFundAlreadyLocked()); lock.expiry = expiry; lock.maximum = maximum; _checkLockInvariant(lock); @@ -82,8 +82,8 @@ abstract contract VaultBase { Timestamp expiry ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); - require(lock.expiry <= expiry, InvalidExpiry()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); + require(lock.expiry <= expiry, VaultInvalidExpiry()); lock.expiry = expiry; _checkLockInvariant(lock); _locks[controller][fund] = lock; @@ -96,7 +96,7 @@ abstract contract VaultBase { uint128 amount ) internal { Lock storage lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account storage account = _accounts[controller][fund][recipient]; @@ -117,10 +117,10 @@ abstract contract VaultBase { uint128 amount ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account memory account = _accounts[controller][fund][recipient]; - require(amount <= account.balance.available, InsufficientBalance()); + require(amount <= account.balance.available, VaultInsufficientBalance()); account.balance.available -= amount; account.balance.designated += amount; @@ -137,10 +137,10 @@ abstract contract VaultBase { uint128 amount ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account memory sender = _accounts[controller][fund][from]; - require(amount <= sender.balance.available, InsufficientBalance()); + require(amount <= sender.balance.available, VaultInsufficientBalance()); sender.balance.available -= amount; _checkAccountInvariant(sender, lock); @@ -158,7 +158,7 @@ abstract contract VaultBase { TokensPerSecond rate ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account memory sender = _accounts[controller][fund][from]; sender.flowOut(rate); @@ -177,10 +177,10 @@ abstract contract VaultBase { uint128 amount ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account storage account = _accounts[controller][fund][recipient]; - require(account.balance.designated >= amount, InsufficientBalance()); + require(account.balance.designated >= amount, VaultInsufficientBalance()); account.balance.designated -= amount; @@ -193,10 +193,10 @@ abstract contract VaultBase { Recipient recipient ) internal { Lock storage lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); Account memory account = _accounts[controller][fund][recipient]; - require(account.flow.incoming == account.flow.outgoing, FlowMustBeZero()); + require(account.flow.incoming == account.flow.outgoing, VaultFlowNotZero()); uint128 amount = account.balance.available + account.balance.designated; lock.value -= amount; @@ -208,7 +208,7 @@ abstract contract VaultBase { function _burnFund(Controller controller, Fund fund) internal { Lock storage lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Locked, FundNotLocked()); + require(lock.status() == LockStatus.Locked, VaultFundNotLocked()); lock.burned = true; @@ -221,7 +221,7 @@ abstract contract VaultBase { Recipient recipient ) internal { Lock memory lock = _locks[controller][fund]; - require(lock.status() == LockStatus.Unlocked, FundNotUnlocked()); + require(lock.status() == LockStatus.Unlocked, VaultFundNotUnlocked()); Account memory account = _accounts[controller][fund][recipient]; account.update(lock.expiry); @@ -241,20 +241,20 @@ abstract contract VaultBase { } function _checkLockInvariant(Lock memory lock) private pure { - require(lock.expiry <= lock.maximum, InvalidExpiry()); + require(lock.expiry <= lock.maximum, VaultInvalidExpiry()); } function _checkAccountInvariant( Account memory account, Lock memory lock ) private pure { - require(account.isSolventAt(lock.maximum), InsufficientBalance()); + require(account.isSolventAt(lock.maximum), VaultInsufficientBalance()); } - error InsufficientBalance(); - error InvalidExpiry(); - error FundNotLocked(); - error FundNotUnlocked(); - error FundAlreadyLocked(); - error FlowMustBeZero(); + error VaultInsufficientBalance(); + error VaultInvalidExpiry(); + error VaultFundNotLocked(); + error VaultFundNotUnlocked(); + error VaultFundAlreadyLocked(); + error VaultFlowNotZero(); } diff --git a/test/Vault.tests.js b/test/Vault.tests.js index 5f53895..bdffdc9 100644 --- a/test/Vault.tests.js +++ b/test/Vault.tests.js @@ -533,9 +533,9 @@ describe("Vault", function () { it("cannot burn tokens that are flowing", async function () { await vault.flow(fund, account.address, account2.address, 5) const burning1 = vault.burnAccount(fund, account.address) - await expect(burning1).to.be.revertedWith("FlowMustBeZero") + await expect(burning1).to.be.revertedWith("FlowNotZero") const burning2 = vault.burnAccount(fund, account2.address) - await expect(burning2).to.be.revertedWith("FlowMustBeZero") + await expect(burning2).to.be.revertedWith("FlowNotZero") }) it("can burn tokens that are no longer flowing", async function () {