Skip to content

Commit

Permalink
added submodules, simplified code
Browse files Browse the repository at this point in the history
  • Loading branch information
d10r committed Nov 18, 2024
1 parent 956c4de commit 64cbde4
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 19 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "projects/money-streaming-intro-foundry/lib/superfluid-protocol-monorepo"]
path = projects/money-streaming-intro-foundry/lib/superfluid-protocol-monorepo
url = https://github.com/superfluid-finance/protocol-monorepo
[submodule "projects/money-streaming-intro-foundry/lib/openzeppelin-contracts"]
path = projects/money-streaming-intro-foundry/lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "projects/money-streaming-intro-foundry/lib/forge-std"]
path = projects/money-streaming-intro-foundry/lib/forge-std
url = https://github.com/foundry-rs/forge-std
11 changes: 11 additions & 0 deletions projects/money-streaming-intro-foundry/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Compiler files
/cache/
/out/
/lcov.info

# Ignores development broadcast logs
/broadcast/

# Dotenv file
/.env
/.env.d

This file was deleted.

1 change: 1 addition & 0 deletions projects/money-streaming-intro-foundry/lib/forge-std
Submodule forge-std added at 1eea5b
Submodule openzeppelin-contracts added at dc44c9
23 changes: 5 additions & 18 deletions projects/money-streaming-intro-foundry/test/MoneyRouter.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
pragma solidity ^0.8.13;

import "forge-std/Test.sol";
import "forge-std/console.sol";
import "ds-test/test.sol";

import "../src/MoneyRouter.sol";
import {ISuperfluid, ISuperToken, ISuperApp } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
import {IConstantFlowAgreementV1} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/agreements/IConstantFlowAgreementV1.sol";
import {ERC1820RegistryCompiled} from "@superfluid-finance/ethereum-contracts/contracts/libs/ERC1820RegistryCompiled.sol";

import {TestToken} from "@superfluid-finance/ethereum-contracts/contracts/utils/TestToken.sol";
import { TestGovernance, Superfluid, ConstantFlowAgreementV1, InstantDistributionAgreementV1, IDAv1Library, SuperTokenFactory} from "@superfluid-finance/ethereum-contracts/contracts/utils/SuperfluidFrameworkDeploymentSteps.sol";
import { ISuperfluid, ISuperToken, IConstantFlowAgreementV1, ISuperApp } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
import { ERC1820RegistryCompiled } from "@superfluid-finance/ethereum-contracts/contracts/libs/ERC1820RegistryCompiled.sol";
import { TestToken } from "@superfluid-finance/ethereum-contracts/contracts/utils/TestToken.sol";
import { SuperfluidFrameworkDeployer } from "@superfluid-finance/ethereum-contracts/contracts/utils/SuperfluidFrameworkDeployer.sol";

import "../src/MoneyRouter.sol";

contract MoneyRouterTest is Test {

MoneyRouter public moneyRouter;
Expand All @@ -25,15 +21,6 @@ contract MoneyRouterTest is Test {
address public account1;
address public account2;

struct Framework {
TestGovernance governance;
Superfluid host;
ConstantFlowAgreementV1 cfa;
InstantDistributionAgreementV1 ida;
IDAv1Library.InitData idaLib;
SuperTokenFactory superTokenFactory;
}

SuperfluidFrameworkDeployer.Framework sf;

function setUp() public {
Expand Down

0 comments on commit 64cbde4

Please sign in to comment.