From 4cb78600c8327c544ba0433a527b6604089eab4b Mon Sep 17 00:00:00 2001 From: andreivladbrg Date: Thu, 7 Dec 2023 12:41:27 +0200 Subject: [PATCH] docs: remove ".md" from hyperlink style: run forge fmt --- README.md | 2 +- script/DeployDeterministicCore.s.sol | 14 +++++--------- script/DeployDeterministicCore2.s.sol | 12 ++++-------- script/DeployDeterministicLockupDynamic.s.sol | 5 +---- script/DeployDeterministicLockupLinear.s.sol | 4 +--- script/DeployLockupDynamic.s.sol | 8 ++------ .../safe-asset-symbol/safeAssetSymbol.t.sol | 6 ++++-- 7 files changed, 18 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 31f08c2c8..7a0877e3d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ docs, as well as these [diagrams](https://docs.sablier.com/contracts/v2/referenc ## Deployments The list of all deployment addresses can be found [here](https://docs.sablier.com). For guidance on the deploy scripts, -see the [Deployments wiki](https://github.com/sablier-labs/v2-core/wiki/Deployments.md). +see the [Deployments wiki](https://github.com/sablier-labs/v2-core/wiki/Deployments). It is worth noting that not every file in this repository is included in the current deployments. For instance, the `SablierV2FlashLoan` abstract is not inherited by any contract on the `main` branch, but we have kept it in version diff --git a/script/DeployDeterministicCore.s.sol b/script/DeployDeterministicCore.s.sol index 4aff58a0b..ebedcded8 100644 --- a/script/DeployDeterministicCore.s.sol +++ b/script/DeployDeterministicCore.s.sol @@ -35,15 +35,11 @@ contract DeployDeterministicCore is BaseScript { ) { bytes32 salt = bytes32(abi.encodePacked(create2Salt)); - comptroller = new SablierV2Comptroller{ salt: salt}(initialAdmin); - nftDescriptor = new SablierV2NFTDescriptor{ salt: salt}(); + comptroller = new SablierV2Comptroller{ salt: salt }(initialAdmin); + nftDescriptor = new SablierV2NFTDescriptor{ salt: salt }(); // forgefmt: disable-next-line - lockupDynamic = new SablierV2LockupDynamic{ salt: salt}( - initialAdmin, - comptroller, - nftDescriptor, - maxSegmentCount - ); - lockupLinear = new SablierV2LockupLinear{ salt: salt}(initialAdmin, comptroller, nftDescriptor); + lockupDynamic = + new SablierV2LockupDynamic{ salt: salt }(initialAdmin, comptroller, nftDescriptor, maxSegmentCount); + lockupLinear = new SablierV2LockupLinear{ salt: salt }(initialAdmin, comptroller, nftDescriptor); } } diff --git a/script/DeployDeterministicCore2.s.sol b/script/DeployDeterministicCore2.s.sol index 32fe3c3a9..a7a0183cf 100644 --- a/script/DeployDeterministicCore2.s.sol +++ b/script/DeployDeterministicCore2.s.sol @@ -34,14 +34,10 @@ contract DeployDeterministicCore2 is BaseScript { ) { bytes32 salt = bytes32(abi.encodePacked(create2Salt)); - comptroller = new SablierV2Comptroller{ salt: salt}(initialAdmin); + comptroller = new SablierV2Comptroller{ salt: salt }(initialAdmin); // forgefmt: disable-next-line - lockupDynamic = new SablierV2LockupDynamic{ salt: salt}( - initialAdmin, - comptroller, - nftDescriptor, - maxSegmentCount - ); - lockupLinear = new SablierV2LockupLinear{ salt: salt}(initialAdmin, comptroller, nftDescriptor); + lockupDynamic = + new SablierV2LockupDynamic{ salt: salt }(initialAdmin, comptroller, nftDescriptor, maxSegmentCount); + lockupLinear = new SablierV2LockupLinear{ salt: salt }(initialAdmin, comptroller, nftDescriptor); } } diff --git a/script/DeployDeterministicLockupDynamic.s.sol b/script/DeployDeterministicLockupDynamic.s.sol index 343188f76..4ddf6e20f 100644 --- a/script/DeployDeterministicLockupDynamic.s.sol +++ b/script/DeployDeterministicLockupDynamic.s.sol @@ -25,10 +25,7 @@ contract DeployDeterministicLockupDynamic is BaseScript { returns (SablierV2LockupDynamic lockupDynamic) { lockupDynamic = new SablierV2LockupDynamic{ salt: bytes32(abi.encodePacked(create2Salt)) }( - initialAdmin, - initialComptroller, - initialNFTDescriptor, - maxSegmentCount + initialAdmin, initialComptroller, initialNFTDescriptor, maxSegmentCount ); } } diff --git a/script/DeployDeterministicLockupLinear.s.sol b/script/DeployDeterministicLockupLinear.s.sol index 13502258b..86b710364 100644 --- a/script/DeployDeterministicLockupLinear.s.sol +++ b/script/DeployDeterministicLockupLinear.s.sol @@ -24,9 +24,7 @@ contract DeployDeterministicLockupLinear is BaseScript { returns (SablierV2LockupLinear lockupLinear) { lockupLinear = new SablierV2LockupLinear{ salt: bytes32(abi.encodePacked(create2Salt)) }( - initialAdmin, - initialComptroller, - initialNFTDescriptor + initialAdmin, initialComptroller, initialNFTDescriptor ); } } diff --git a/script/DeployLockupDynamic.s.sol b/script/DeployLockupDynamic.s.sol index 3af0a7088..3b1256acb 100644 --- a/script/DeployLockupDynamic.s.sol +++ b/script/DeployLockupDynamic.s.sol @@ -19,11 +19,7 @@ contract DeployLockupDynamic is BaseScript { broadcast returns (SablierV2LockupDynamic lockupDynamic) { - lockupDynamic = new SablierV2LockupDynamic( - initialAdmin, - initialComptroller, - initialNFTDescriptor, - maxSegmentCount - ); + lockupDynamic = + new SablierV2LockupDynamic(initialAdmin, initialComptroller, initialNFTDescriptor, maxSegmentCount); } } diff --git a/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol b/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol index e8079a2c4..74188c22a 100644 --- a/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol +++ b/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol @@ -36,8 +36,10 @@ contract SafeAssetSymbol_Integration_Concrete_Test is NFTDescriptor_Integration_ } function test_SafeAssetSymbol_LongSymbol() external whenERC20Contract givenSymbolString { - ERC20 asset = - new ERC20({ name_: "Token", symbol_: "This symbol is has more than 30 characters and it should be ignored" }); + ERC20 asset = new ERC20({ + name_: "Token", + symbol_: "This symbol is has more than 30 characters and it should be ignored" + }); string memory actualSymbol = nftDescriptorMock.safeAssetSymbol_(address(asset)); string memory expectedSymbol = "Long Symbol"; assertEq(actualSymbol, expectedSymbol, "symbol");