Skip to content

Commit

Permalink
move facets to airdrop folder
Browse files Browse the repository at this point in the history
  • Loading branch information
giuseppecrj committed Dec 20, 2024
1 parent b95da4e commit 9a257ce
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion contracts/scripts/deployments/facets/DeployDropFacet.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pragma solidity ^0.8.23;
//contracts
import {Deployer} from "contracts/scripts/common/Deployer.s.sol";
import {FacetHelper} from "contracts/test/diamond/Facet.t.sol";
import {DropFacet} from "contracts/src/tokens/drop/DropFacet.sol";
import {DropFacet} from "contracts/src/airdrop/drop/DropFacet.sol";

contract DeployDropFacet is Deployer, FacetHelper {
// FacetHelper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pragma solidity ^0.8.23;
//contracts
import {Deployer} from "contracts/scripts/common/Deployer.s.sol";
import {FacetHelper} from "contracts/test/diamond/Facet.t.sol";
import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";

contract DeployRiverPoints is Deployer, FacetHelper {
// FacetHelper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.8.23;

// interfaces
import {IDropFacetBase, IDropFacet} from "contracts/src/tokens/drop/IDropFacet.sol";
import {IDropFacetBase, IDropFacet} from "contracts/src/airdrop/drop/IDropFacet.sol";

// libraries
import {MerkleTree} from "contracts/test/utils/MerkleTree.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
pragma solidity ^0.8.23;

// interfaces
import {IDropFacet} from "contracts/src/tokens/drop/IDropFacet.sol";
import {IDropFacet} from "contracts/src/airdrop/drop/IDropFacet.sol";
import {IRewardsDistribution} from "contracts/src/base/registry/facets/distribution/v2/IRewardsDistribution.sol";

// libraries
import {DropStorage} from "contracts/src/tokens/drop/DropStorage.sol";
import {DropStorage} from "contracts/src/airdrop/drop/DropStorage.sol";
import {CurrencyTransfer} from "contracts/src/utils/libraries/CurrencyTransfer.sol";

import {SafeCastLib} from "solady/utils/SafeCastLib.sol";

// contracts
import {Facet} from "@river-build/diamond/src/facets/Facet.sol";
import {DropFacetBase} from "contracts/src/tokens/drop/DropFacetBase.sol";
import {DropFacetBase} from "contracts/src/airdrop/drop/DropFacetBase.sol";
import {OwnableBase} from "@river-build/diamond/src/facets/ownable/OwnableBase.sol";

contract DropFacet is IDropFacet, DropFacetBase, OwnableBase, Facet {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {IImplementationRegistry} from "contracts/src/factory/facets/registry/IIm
import {IRolesBase} from "contracts/src/spaces/facets/roles/IRoles.sol";
import {IRuleEntitlement} from "contracts/src/spaces/entitlements/rule/IRuleEntitlement.sol";
import {IMembership} from "contracts/src/spaces/facets/membership/IMembership.sol";
import {IRiverPointsBase} from "contracts/src/tokens/points/IRiverPoints.sol";
import {IRiverPointsBase} from "contracts/src/airdrop/points/IRiverPoints.sol";

// libraries
import {Permissions} from "contracts/src/spaces/facets/Permissions.sol";
Expand All @@ -24,7 +24,7 @@ import {Entitled} from "contracts/src/spaces/facets/Entitled.sol";
import {PrepayBase} from "contracts/src/spaces/facets/prepay/PrepayBase.sol";
import {ReferralsBase} from "contracts/src/spaces/facets/referrals/ReferralsBase.sol";
import {EntitlementGatedBase} from "contracts/src/spaces/facets/gated/EntitlementGatedBase.sol";
import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";

/// @title MembershipJoin
/// @notice Handles the logic for joining a space, including entitlement checks and payment processing
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/airdrop/DropFacet.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import {Vm} from "forge-std/Test.sol";

//interfaces

import {IDropFacetBase} from "contracts/src/tokens/drop/IDropFacet.sol";
import {IDropFacetBase} from "contracts/src/airdrop/drop/IDropFacet.sol";
import {IOwnableBase} from "@river-build/diamond/src/facets/ownable/IERC173.sol";
import {IRewardsDistributionBase} from "contracts/src/base/registry/facets/distribution/v2/IRewardsDistribution.sol";

//libraries
import {FixedPointMathLib} from "solady/utils/FixedPointMathLib.sol";
import {MerkleTree} from "contracts/test/utils/MerkleTree.sol";
import {DropFacet} from "contracts/src/tokens/drop/DropFacet.sol";
import {DropFacet} from "contracts/src/airdrop/drop/DropFacet.sol";
import {RewardsDistribution} from "contracts/src/base/registry/facets/distribution/v2/RewardsDistribution.sol";
import {BasisPoints} from "contracts/src/utils/libraries/BasisPoints.sol";
import {DropStorage} from "contracts/src/tokens/drop/DropStorage.sol";
import {DropStorage} from "contracts/src/airdrop/drop/DropStorage.sol";
import {EIP712Utils} from "contracts/test/utils/EIP712Utils.sol";
import {NodeOperatorStatus} from "contracts/src/base/registry/facets/operator/NodeOperatorStorage.sol";

Expand Down
6 changes: 3 additions & 3 deletions contracts/test/airdrop/RiverPoints.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ pragma solidity ^0.8.19;
//interfaces
import {IDiamond} from "@river-build/diamond/src/Diamond.sol";
import {IOwnableBase} from "@river-build/diamond/src/facets/ownable/IERC173.sol";
import {IRiverPointsBase} from "contracts/src/tokens/points/IRiverPoints.sol";
import {IRiverPointsBase} from "contracts/src/airdrop/points/IRiverPoints.sol";

//libraries
import {CheckIn} from "contracts/src/tokens/points/CheckIn.sol";
import {CheckIn} from "contracts/src/airdrop/points/CheckIn.sol";

// contracts
import {River} from "contracts/src/tokens/river/base/River.sol";
import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";
import {BaseRegistryTest} from "../base/registry/BaseRegistry.t.sol";

contract RiverPointsTest is
Expand Down

0 comments on commit 9a257ce

Please sign in to comment.