Skip to content

Commit e7b0f5a

Browse files
committed
unallocatedNetworkLiquidity --> unallocatedLiquidity
1 parent 295aaad commit e7b0f5a

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

packages/v3/contracts/network/BancorNetwork.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ contract BancorNetwork is IBancorNetwork, Upgradeable, ReentrancyGuardUpgradeabl
768768

769769
// if all network token liquidity is allocated - it's enough to check that the pool is whitelisted. Otherwise,
770770
// we need to check if the network token pool is able to provide network liquidity
771-
uint256 unallocatedNetworkTokenLiquidity = cachedNetworkTokenPool.unallocatedNetworkLiquidity(pool);
771+
uint256 unallocatedNetworkTokenLiquidity = cachedNetworkTokenPool.unallocatedLiquidity(pool);
772772
if (unallocatedNetworkTokenLiquidity == 0) {
773773
require(_settings.isTokenWhitelisted(pool), "ERR_POOL_NOT_WHITELISTED");
774774
} else {

packages/v3/contracts/pools/NetworkTokenPool.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ contract NetworkTokenPool is INetworkTokenPool, Upgradeable, ReentrancyGuardUpgr
226226
/**
227227
* @inheritdoc INetworkTokenPool
228228
*/
229-
function unallocatedNetworkLiquidity(IReserveToken pool) external view override returns (uint256) {
229+
function unallocatedLiquidity(IReserveToken pool) external view override returns (uint256) {
230230
return MathEx.subMax0(_settings.poolMintingLimit(pool), _mintedAmounts[pool]);
231231
}
232232

packages/v3/contracts/pools/interfaces/INetworkTokenPool.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ interface INetworkTokenPool is IUpgradeable {
9191
/**
9292
* @dev returns the unallocated co-investment network token liquidity for a given pool
9393
*/
94-
function unallocatedNetworkLiquidity(IReserveToken pool) external view returns (uint256);
94+
function unallocatedLiquidity(IReserveToken pool) external view returns (uint256);
9595

9696
/**
9797
* @dev mints network tokens to the recipient

packages/v3/test/pools/NetworkTokenPool.ts

+6-10
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ describe('NetworkTokenPool', () => {
317317
const testRequest = async (amount: BigNumber, expectedAmount: BigNumber) => {
318318
const prevStakedBalance = await networkTokenPool.stakedBalance();
319319
const prevMintedAmount = await networkTokenPool.mintedAmount(reserveToken.address);
320-
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedNetworkLiquidity(reserveToken.address);
320+
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedLiquidity(reserveToken.address);
321321

322322
const prevPoolTokenTotalSupply = await networkPoolToken.totalSupply();
323323
const prevPoolPoolTokenBalance = await networkPoolToken.balanceOf(networkTokenPool.address);
@@ -346,7 +346,7 @@ describe('NetworkTokenPool', () => {
346346
expect(await networkTokenPool.mintedAmount(reserveToken.address)).to.equal(
347347
prevMintedAmount.add(expectedAmount)
348348
);
349-
expect(await networkTokenPool.unallocatedNetworkLiquidity(reserveToken.address)).to.equal(
349+
expect(await networkTokenPool.unallocatedLiquidity(reserveToken.address)).to.equal(
350350
prevUnallocatedLiquidity.sub(expectedAmount)
351351
);
352352

@@ -532,9 +532,7 @@ describe('NetworkTokenPool', () => {
532532
const testRenounce = async (amount: BigNumber) => {
533533
const prevStakedBalance = await networkTokenPool.stakedBalance();
534534
const prevMintedAmount = await networkTokenPool.mintedAmount(reserveToken.address);
535-
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedNetworkLiquidity(
536-
reserveToken.address
537-
);
535+
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedLiquidity(reserveToken.address);
538536

539537
const prevPoolTokenTotalSupply = await networkPoolToken.totalSupply();
540538
const prevPoolPoolTokenBalance = await networkPoolToken.balanceOf(networkTokenPool.address);
@@ -560,7 +558,7 @@ describe('NetworkTokenPool', () => {
560558
prevMintedAmount.sub(renouncedAmount)
561559
);
562560

563-
expect(await networkTokenPool.unallocatedNetworkLiquidity(reserveToken.address)).to.equal(
561+
expect(await networkTokenPool.unallocatedLiquidity(reserveToken.address)).to.equal(
564562
prevUnallocatedLiquidity.gt(renouncedAmount)
565563
? prevUnallocatedLiquidity.add(renouncedAmount)
566564
: MINTING_LIMIT
@@ -1030,9 +1028,7 @@ describe('NetworkTokenPool', () => {
10301028
it(`should collect ${name} fees of ${feeAmount.toString()}`, async () => {
10311029
const prevStakedBalance = await networkTokenPool.stakedBalance();
10321030
const prevMintedAmount = await networkTokenPool.mintedAmount(reserveToken.address);
1033-
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedNetworkLiquidity(
1034-
reserveToken.address
1035-
);
1031+
const prevUnallocatedLiquidity = await networkTokenPool.unallocatedLiquidity(reserveToken.address);
10361032
const expectedMintedAmount = type === FEE_TYPES.trading ? feeAmount : 0;
10371033

10381034
await network.onNetworkTokenFeesCollectedT(reserveToken.address, feeAmount, type);
@@ -1041,7 +1037,7 @@ describe('NetworkTokenPool', () => {
10411037
expect(await networkTokenPool.mintedAmount(reserveToken.address)).to.equal(
10421038
prevMintedAmount.add(expectedMintedAmount)
10431039
);
1044-
expect(await networkTokenPool.unallocatedNetworkLiquidity(reserveToken.address)).to.equal(
1040+
expect(await networkTokenPool.unallocatedLiquidity(reserveToken.address)).to.equal(
10451041
prevUnallocatedLiquidity.sub(expectedMintedAmount)
10461042
);
10471043
});

0 commit comments

Comments
 (0)