Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(github/worklfow): add on: triggers; correct import error in tests #35

Merged
merged 3 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: test

on: workflow_dispatch
on:
push:
branches: [ master, develop ]
pull_request:
branches: [ master, develop ]
workflow_dispatch:

env:
FOUNDRY_PROFILE: ci
Expand All @@ -22,6 +27,11 @@ jobs:
with:
version: nightly

- name: Check Code Formatting
run: |
forge fmt --check
id: formatting

- name: Run Forge build
run: |
forge --version
Expand Down
3 changes: 1 addition & 2 deletions src/circles/TemporalDiscount.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ contract TemporalDiscount is IERC20 {
/**
* Store the signed 128-bit 64.64 representation of 1 as a constant
*/
int128 internal constant ONE_64x64 = int128(2**64);
int128 internal constant ONE_64x64 = int128(2 ** 64);

/**
* Reduction factor gamma for temporally discounting balances
Expand Down Expand Up @@ -249,7 +249,6 @@ contract TemporalDiscount is IERC20 {
// and update the timespan in which we updated the balance.
balanceTimeSpans[_owner] = _currentSpan;


// emit DiscountCost only when effectively discounted.
// if the original balance was zero before adding,
// discount cost can still be zero, even when discounted
Expand Down
2 changes: 1 addition & 1 deletion test/graph/Graph.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "../../src/graph/Graph.sol";
import "../../src/graph/ICircleNode.sol";
import "../../src/circles/TimeCircle.sol";
import "../../src/circles/GroupCircle.sol";
import "./MockHubV1.sol";
import "./MockHub.sol";
import "./MockInternalGraph.sol";

contract GraphTest is Test {
Expand Down
2 changes: 1 addition & 1 deletion test/graph/GraphPathTransfer.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "../../src/graph/ICircleNode.sol";
import "../../src/circles/TimeCircle.sol";
import "../../src/circles/GroupCircle.sol";
import "../setup/TimeSetup.sol";
import "./MockHubV1.sol";
import "./MockHub.sol";

contract GraphPathTransferTest is Test, TimeSetup {
// Constant
Expand Down
File renamed without changes.