Skip to content
This repository has been archived by the owner on Sep 27, 2019. It is now read-only.

Server adjudicator watcher #466

Merged
merged 21 commits into from
May 9, 2019
Merged

Server adjudicator watcher #466

merged 21 commits into from
May 9, 2019

Conversation

kerzhner
Copy link
Contributor

@kerzhner kerzhner commented May 7, 2019 •
edited
Loading

This PR addresses part of #437.

  • Adds channel_id to the AllocatorChannel table.
  • A standalone process monitors for chain events.
  • A basic unit test that spins up the process, sends an event to Ganache and waits for the event listener to fire.
  • Dynamically import locally-built artifacts vs prebuilt artifacts based on the environment.

Remaining items that can be addressed in future pull requests:

  • Event monitors and tests for events other than funding.
  • Spin up the adjudicator watcher when deploying to Heroku.
  • Local setup for manual/integration testing of the server and wallet pointing to the same Ganache instance.

@kerzhner kerzhner had a problem deploying to rps-autoplayer-staging May 8, 2019 15:16 Failure
@kerzhner kerzhner force-pushed the adjudicator-watcher-common-data branch from e58cdf0 to 53f3e4b Compare May 8, 2019 19:27
@kerzhner kerzhner had a problem deploying to rps-autoplayer-staging May 8, 2019 19:51 Failure
@kerzhner kerzhner had a problem deploying to rps-autoplayer-staging May 8, 2019 20:09 Failure
@kerzhner kerzhner had a problem deploying to rps-autoplayer-staging May 8, 2019 20:13 Failure
@kerzhner kerzhner temporarily deployed to rps-autoplayer-staging May 8, 2019 20:17 Inactive
@kerzhner kerzhner temporarily deployed to rps-autoplayer-staging May 8, 2019 20:22 Inactive
@kerzhner kerzhner temporarily deployed to rps-autoplayer-staging May 8, 2019 20:25 Inactive
@kerzhner kerzhner force-pushed the adjudicator-watcher-common-data branch from e4d578e to 53f3e4b Compare May 8, 2019 20:32
tomclose
tomclose approved these changes May 9, 2019
View reviewed changes
Copy link
Contributor

@tomclose tomclose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

packages/server/src/wallet/adjudicator-watcher/__chain-test__/adjudicator-watcher.test.ts
const eventCallback = async eventType => {
const postEventHoldings = await getHoldings();

const eventDeposit = bigNumberify(postEventHoldings).sub(bigNumberify(preEventHoldings));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this name a bit confusing. Maybe something like depositedAmount would be clearer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback, @tomclose.

packages/server/src/wallet/adjudicator-watcher/__chain-test__/utils.ts
};
}

export async function depositContract(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe depositIntoContract or makeDeposit?

kerzhner added 20 commits May 9, 2019 09:22
@kerzhner @tomclose
Start on the adjudicator watcher
f481faf
@kerzhner @tomclose
Add channel_id to allocator_channels table
7522e54
@kerzhner @tomclose
Adjudicator watcher: clean up stale comments
0de741f
@kerzhner @tomclose
Server adjudicator watcher: unit test triggers adjudicator run
b4c5c88
@kerzhner @tomclose
Unit test passing
8ea1501
@kerzhner @tomclose
Cleaning up comments
f89bc16
@kerzhner @tomclose
Server adjudicator watcher: all unit tests passing locally
25ea4b1
@kerzhner @tomclose
Server adjudicator watcher: factor out jest config from package.json
54efabd
@kerzhner @tomclose
Server adjudicator watcher: No longer rely on prebuilt_contracts
758609d
@kerzhner @tomclose
Remove tsc from build
564ce2c
@kerzhner @tomclose
Try to make the adjudicator watcher test pass
d485a02
@kerzhner @tomclose
Set DEV_GANACHE_PORT for yarn test:ci
03291b0
@kerzhner @tomclose
Update path for server test
07770bb
@kerzhner @tomclose
Add TestContract.sol for ganache deploys
704d5c6
@kerzhner @tomclose
Abstract away artifact import
b3e739b
@kerzhner @tomclose
Dynamically loading the correct artifact
67c8c98
@kerzhner @tomclose
Renaming common-data import to wallet-common
f1efb28
@kerzhner @tomclose
Seed database with correct fund amount
5077c2c
@kerzhner @tomclose
Add copy-client-contracts
47efa40
@kerzhner @tomclose
Remove local hardcodes from .env
030868d
@tomclose tomclose force-pushed the adjudicator-watcher-common-data branch from 85c1e8e to 6ecab82 Compare May 9, 2019 08:22
@tomclose tomclose merged commit be9aba4 into master May 9, 2019
@tomclose tomclose deleted the adjudicator-watcher-common-data branch May 9, 2019 08:33
kerzhner added a commit that referenced this pull request May 9, 2019
@kerzhner
Address renames from #466 review
3c5f5c4
kerzhner added a commit that referenced this pull request May 9, 2019
@kerzhner
Address renames from #466 review
0c435c5
kerzhner added a commit that referenced this pull request May 9, 2019
@kerzhner
Address renames from #466 review
0892821
lalexgap pushed a commit to statechannels/statechannels that referenced this pull request Sep 25, 2019
@kerzhner @lalexgap
Address renames from magmo/apps#466 review
c5fba4e
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tomclose tomclose tomclose approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kerzhner @tomclose