Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Faucet rebased and squashed against develop #3541

Merged
merged 5 commits into from
Sep 16, 2018
Merged

Faucet rebased and squashed against develop #3541

merged 5 commits into from
Sep 16, 2018

Conversation

commandodev
Copy link
Contributor

See #3513 and #2939 which contain the same work but are hard to impossible to merge back to develop

cc @erikd

@jcmincke
Copy link
Contributor

jcmincke commented Sep 5, 2018

Not sure this code should go into develop. It should go into release/1.3.1.
Don't merge, I am checking it with Ben

@erikd
Copy link
Member

erikd commented Sep 5, 2018

@jcmincke The faucet code is already in the release/1.3.1 release. This is simply the port of that code into the develop branch. Porting it separately is a cleaner more reliable way of moving code between branches than the huge, potentially unreliable "git merge"s we have been doing.

@jcmincke
Copy link
Contributor

@erikd Thanks, when do you think it can be merged?

@erikd
Copy link
Member

erikd commented Sep 11, 2018

Well it obviously cannot be merged until it passes CI.

@rvl
Copy link
Contributor

rvl commented Sep 14, 2018

This PR is missing my commit ce421d8 from release/1.3.1. That change helps with local manual testing of faucet.

@commandodev
Copy link
Contributor Author

@rvl - Yes I think that commit should be included

Ben Ford and others added 4 commits September 16, 2018 10:22
…velop

[DEVOPS-834] Add a process that checks the wallet balance periodically

[DEVOPS-834] Uncomment type sig as suggested

[DEVOPS-834] Fix copyright in license

[DEVOPS-834] Split queue logic from withdrawl function

Also document the processWithdrawls function

[DEVOPS-834] Remove faucet shell.nix, default.nix and .projectile

[DEVOPS-834] Remove commented code

[DEVOPS-834] withdrawl -> withdrawal

[DEVOPS-834] Get test suite running

[DEVOPS-834] Apply stack2nix patch from buildkite

And stylish.diff from hydra

[DEVOPS-834] Change executable name to cardano-faucet

[DEVOPS-834] Switch to optparse-applicative for command line

Add the --ekg-server commandline option

[DEVOPS-834] Use a file to read the recaptcha secret from a file

* Config parameter has changed to "recaptcha-secret-file"
* The actual secret is now a field in FaucetEnv

[DEVOPS-834] Change logging of wallet balance to DEBUG

[DEVOPS-834] Handle newlines in recaptcha secret file

Also adds a couple of tests for readCaptchaSecret

[DEVOPS-834] Apply stylish.diff

[DEVOPS-834] Add demo frontend to faucet

[DEVOPS-834] Fix faucet static serving

[DEVOPS-834] Apply stylish haskell fixes

[DEVOPS-834] Add universium and fix indentation/sorting of deps

[DEVOPS-834] Switch to universum

[DEVOPS-834] Switch to safe-exceptions

[DEVOPS-834] Fix for upstream API changes

[DEVOPS-834] Apply stack2nix patch

[DEVOPS-834] Apply stylish.diff from hydra

[DEVOPS-834] Remove existing wallet json file

[DEVOP-834] Add -Wall everywhere

[DEVOPS-834] Use a pattern match instead of whenJust

[DEVOPS-834] Remove unused decrWithdrawn function

[DEVOPS-834] Remove unused DepositRequest and DepositResult

[DEVOPS-834] Remove -Wall from the modules

[DEVOPS-834] Fix some warnings
@erikd
Copy link
Member

erikd commented Sep 16, 2018

Rebased and cherry-pick the commit @rvl mentioned.

Helps when testing locally using curl. If there is a recaptcha secret
configured, it will fail the recaptcha check and return HTTP 400.

(cherry picked from commit ce421d8)
@erikd erikd merged commit 1c58318 into develop Sep 16, 2018
@erikd erikd deleted the faucet branch September 16, 2018 03:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants