[ETCM-215] faucet rpc client #798
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mirkoAlic
reviewed
Nov 24, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/security/SSLContextFactory.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 24, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/security/SecureRandomBuilder.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 24, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/security/SSLConfig.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 24, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/security/KeyStoreUtils.scala
Outdated
Show resolved
Hide resolved
biandratti
changed the title
mirkoAlic
reviewed
Nov 25, 2020
mirkoAlic
reviewed
Nov 25, 2020
src/main/scala/io/iohk/ethereum/faucet/jsonrpc/FaucetHandlerSelector.scala
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 25, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/client/RpcBaseClient.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 25, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/client/RpcBaseClient.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 25, 2020
src/main/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServer.scala
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 25, 2020
mirkoAlic
reviewed
Nov 25, 2020
mirkoAlic
reviewed
Nov 25, 2020
src/test/scala/io/iohk/ethereum/security/SSLContextFactorySpec.scala
Outdated
Show resolved
Hide resolved
mmrozek
reviewed
Nov 26, 2020
| maybeSslContext.fold(Http().defaultClientHttpsContext)(ConnectionContext.httpsClient) | ||
|
|
||
| def shutdown(): Unit = { | ||
| Await.ready(system.terminate(), 5.seconds) |
Contributor
There was a problem hiding this comment.
It will be better if e use timeout from config (ex. mantis.shutdown-timeout)
Contributor
There was a problem hiding this comment.
BTW I can't find where it is used and I am not sure that this code should be able to terminate system passed to the class from outside.
Contributor
Author
There was a problem hiding this comment.
I am not sure if we need this function called “shutdown()”. What do you think? Do we need it?
Contributor
There was a problem hiding this comment.
I think we don't need it. It should be done at some higher level class
Contributor
Author
There was a problem hiding this comment.
This function called “shutdown” was used only in the “mallet” module. But mallet now uses the class “RpcClientMallet”. This client needs the “shutdown” function.
But we have pending removal of this module in task “ETCM-423”. So I removed this function that is not used.
src/main/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpsServer.scala
Outdated
Show resolved
Hide resolved
src/main/scala/io/iohk/ethereum/faucet/jsonrpc/FaucetSSLContextRpcClientBuilder.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 27, 2020
src/main/scala/io/iohk/ethereum/faucet/jsonrpc/WalletRpcClient.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
reviewed
Nov 27, 2020
src/main/scala/io/iohk/ethereum/faucet/jsonrpc/WalletService.scala
Outdated
Show resolved
Hide resolved
mirkoAlic
approved these changes
Nov 27, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The faucet uses RpcClient to connect with the node. We had a RpcClient in the module “mallet”. This client is not async, it makes a “await” (blockin the threads) for all requests. Also it has not implemented the ssl behavior when connected with node secure (https).
Proposed Solution
Important Changes Introduced
Change the name of ssl properties. And add new ssl context used for rpc client from “faucet”.
Testing
ssl regression in faucet and node