Skip to content

Commit f437d33

Browse files
thedavidmeisterthedavidmeister
authored
Merge pull request #257 from gildlab/2025-11-04-path
relative paths
2 parents d67bf92 + 2aced0e commit f437d33

15 files changed

+41
-48
lines changed

‎test/abstract/ERC20PriceOracleReceiptVaultTest.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
ERC20PriceOracleReceiptVaultConfig
1212
} from "src/concrete/vault/ERC20PriceOracleReceiptVault.sol";
1313
import {LibERC20PriceOracleReceiptVaultCreator} from "../lib/LibERC20PriceOracleReceiptVaultCreator.sol";
14-
import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
14+
import {Receipt as ReceiptContract} from "../../src/concrete/receipt/Receipt.sol";
1515
import {IERC20} from "forge-std/interfaces/IERC20.sol";
16-
import {IPriceOracleV2} from "src/interface/IPriceOracleV2.sol";
16+
import {IPriceOracleV2} from "../../src/interface/IPriceOracleV2.sol";
1717

1818
contract ERC20PriceOracleReceiptVaultTest is Test {
1919
ICloneableFactoryV2 internal immutable I_FACTORY;

‎test/abstract/OffchainAssetReceiptVaultTest.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import {
1111
ReceiptVaultConstructionConfigV2
1212
} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
1313
import {LibOffchainAssetVaultCreator} from "../lib/LibOffchainAssetVaultCreator.sol";
14-
import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
15-
import {OffchainAssetReceiptVaultAuthorizerV1} from "src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
14+
import {Receipt as ReceiptContract} from "../../src/concrete/receipt/Receipt.sol";
15+
import {OffchainAssetReceiptVaultAuthorizerV1} from
16+
"../../src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
1617

1718
contract OffchainAssetReceiptVaultTest is Test {
1819
ICloneableFactoryV2 internal immutable I_FACTORY;

‎test/abstract/ReceiptFactoryTest.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ pragma solidity ^0.8.25;
55
import {ICloneableFactoryV2} from "rain.factory/interface/ICloneableFactoryV2.sol";
66
import {CloneFactory} from "rain.factory/concrete/CloneFactory.sol";
77
import {Test} from "forge-std/Test.sol";
8-
import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
9-
import {ERC20PriceOracleReceipt} from "src/concrete/receipt/ERC20PriceOracleReceipt.sol";
10-
import {DATA_URI_BASE64_PREFIX} from "src/concrete/receipt/Receipt.sol";
8+
import {Receipt as ReceiptContract} from "../../src/concrete/receipt/Receipt.sol";
9+
import {ERC20PriceOracleReceipt} from "../../src/concrete/receipt/ERC20PriceOracleReceipt.sol";
10+
import {DATA_URI_BASE64_PREFIX} from "../../src/concrete/receipt/Receipt.sol";
1111
import {Base64} from "solady/utils/Base64.sol";
1212

1313
contract ReceiptFactoryTest is Test {

‎test/concrete/ConcreteReceiptVault.sol‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import {
66
ReceiptVault,
77
VaultConfig,
88
ReceiptVaultConstructionConfigV2,
9-
ICloneableFactoryV2,
10-
IReceiptV3
11-
} from "src/abstract/ReceiptVault.sol";
9+
ICloneableFactoryV2
10+
} from "../../src/abstract/ReceiptVault.sol";
1211
import {CloneFactory} from "rain.factory/concrete/CloneFactory.sol";
13-
import {Receipt} from "src/concrete/receipt/Receipt.sol";
14-
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
12+
import {Receipt} from "../../src/concrete/receipt/Receipt.sol";
13+
import {ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
1514

1615
contract ConcreteReceiptVault is ReceiptVault {
1716
constructor()

‎test/src/abstract/ReceiptVault.decimals.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
44

55
import {ConcreteReceiptVault} from "test/concrete/ConcreteReceiptVault.sol";
66
import {TestErc20} from "test/concrete/TestErc20.sol";
7-
import {ReceiptVault, VaultConfig} from "src/abstract/ReceiptVault.sol";
7+
import {VaultConfig} from "src/abstract/ReceiptVault.sol";
88

99
import {Test} from "forge-std/Test.sol";
1010

‎test/src/abstract/ReceiptVault.ierc165.t.sol‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {
6-
ReceiptVault,
7-
ReceiptVaultConstructionConfigV2,
8-
IReceiptV3,
9-
ICloneableFactoryV2,
10-
IReceiptManagerV2,
11-
IReceiptVaultV3,
12-
ICloneableV2
13-
} from "src/abstract/ReceiptVault.sol";
5+
import {IReceiptManagerV2, IReceiptVaultV3, ICloneableV2} from "src/abstract/ReceiptVault.sol";
146
import {Test} from "forge-std/Test.sol";
157
import {ConcreteReceiptVault} from "test/concrete/ConcreteReceiptVault.sol";
168

‎test/src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.deposit.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import {OffchainAssetReceiptVaultPaymentMintAuthorizerV1Config} from
1515
import {DepositStateChange, DEPOSIT, CERTIFY} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
1616
import {IERC20Upgradeable as IERC20} from
1717
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
18-
import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
19-
import {OffchainAssetReceiptVault} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
18+
import {Receipt as ReceiptContract} from "../../../../src/concrete/receipt/Receipt.sol";
19+
import {OffchainAssetReceiptVault} from "../../../../src/concrete/vault/OffchainAssetReceiptVault.sol";
2020
import {
2121
ReceiptVaultConstructionConfigV2,
2222
OffchainAssetVaultConfigV2,
2323
VaultConfig
24-
} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
24+
} from "../../../../src/concrete/vault/OffchainAssetReceiptVault.sol";
2525
import {VerifyAlwaysApproved} from "rain.verify.interface/concrete/VerifyAlwaysApproved.sol";
2626
import {LibFixedPointDecimalScale, FLAG_ROUND_UP} from "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
2727
import {ICloneableFactoryV2} from "rain.factory/interface/ICloneableFactoryV2.sol";

‎test/src/concrete/receipt/Receipt.metadata.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
44

55
import {ReceiptFactoryTest} from "test/abstract/ReceiptFactoryTest.sol";
66
import {TestReceiptManager} from "test/concrete/TestReceiptManager.sol";
7-
import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
7+
import {Receipt as ReceiptContract} from "../../../../src/concrete/receipt/Receipt.sol";
88

99
contract ReceiptMetadataTest is ReceiptFactoryTest {
1010
function testReceiptURI(uint256 id, uint8 decimalsB) external {

‎test/src/concrete/receipt/Receipt.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {Receipt as ReceiptContract, IReceiptV3} from "src/concrete/receipt/Receipt.sol";
5+
import {Receipt as ReceiptContract, IReceiptV3} from "../../../../src/concrete/receipt/Receipt.sol";
66
import {TestReceiptManager, UnauthorizedTransfer} from "test/concrete/TestReceiptManager.sol";
77
import {LibUniqueAddressesGenerator} from "../../../lib/LibUniqueAddressesGenerator.sol";
88
import {ReceiptFactoryTest} from "test/abstract/ReceiptFactoryTest.sol";
9-
import {OnlyManager} from "src/error/ErrReceipt.sol";
9+
import {OnlyManager} from "../../../../src/error/ErrReceipt.sol";
1010

1111
contract ReceiptTest is ReceiptFactoryTest {
1212
function testInitialize() public {

‎test/src/concrete/vault/ERC20PriceOracleReceiptVault.mint.t.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {MinShareRatio, ZeroAssetsAmount} from "src/abstract/ReceiptVault.sol";
6-
import {ERC20PriceOracleReceiptVault} from "src/concrete/vault/ERC20PriceOracleReceiptVault.sol";
5+
import {MinShareRatio, ZeroAssetsAmount} from "../../../../src/abstract/ReceiptVault.sol";
6+
import {ERC20PriceOracleReceiptVault} from "../../../../src/concrete/vault/ERC20PriceOracleReceiptVault.sol";
77
import {ERC20PriceOracleReceiptVaultTest} from "test/abstract/ERC20PriceOracleReceiptVaultTest.sol";
88
import {
99
LibFixedPointDecimalArithmeticOpenZeppelin,
1010
Math
1111
} from "rain.math.fixedpoint/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol";
1212
import {IERC20} from "forge-std/interfaces/IERC20.sol";
1313
import {LibUniqueAddressesGenerator} from "../../../lib/LibUniqueAddressesGenerator.sol";
14-
import {IReceiptV3} from "src/concrete/receipt/Receipt.sol";
15-
import {IReceiptVaultV1} from "src/interface/IReceiptVaultV3.sol";
14+
import {IReceiptV3} from "../../../../src/concrete/receipt/Receipt.sol";
15+
import {IReceiptVaultV1} from "../../../../src/interface/IReceiptVaultV3.sol";
1616

1717
contract ERC20PriceOracleReceiptVaultMintTest is ERC20PriceOracleReceiptVaultTest {
1818
using LibFixedPointDecimalArithmeticOpenZeppelin for uint256;

0 commit comments

Comments
 (0)