From e9e84e4bb66f34029269088d4572243305db049b Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Tue, 28 Nov 2023 11:23:28 +0200 Subject: [PATCH] chore: fix forge formatting --- 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 ++++-- 6 files changed, 17 insertions(+), 32 deletions(-) diff --git a/script/DeployDeterministicCore.s.sol b/script/DeployDeterministicCore.s.sol index 617090829..aac8a7ab9 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 9a5805e32..c6b76b4f7 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 4440a16f2..8c25b4a83 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 b2a4edb4d..3526a45fb 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 5e9f0098e..b27f75396 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");