-
Notifications
You must be signed in to change notification settings - Fork 839
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
Implemented priv_getLogs #686
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c5296a5
Implemented priv_getLogs
lucassaldanha b03eca0
Removing comment
lucassaldanha 1092f30
PR comments
lucassaldanha 0e97569
priv_getLogs ATs
lucassaldanha e61cc16
Merge branch 'master' into priv_getLogs
lucassaldanha 9f724ed
Fix finals
lucassaldanha 9f1ce56
Fix tests
lucassaldanha File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
59 changes: 59 additions & 0 deletions
59
...n/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/util/LogFilterJsonParameter.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.tests.acceptance.dsl.privacy.util; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class LogFilterJsonParameter { | ||
|
|
||
| private final String fromBlock; | ||
| private final String toBlock; | ||
| private final List<String> addresses; | ||
| private final List<List<String>> topics; | ||
| private final String blockhash; | ||
|
|
||
| public LogFilterJsonParameter( | ||
| final String fromBlock, | ||
| final String toBlock, | ||
| final List<String> addresses, | ||
| final List<List<String>> topics, | ||
| final String blockhash) { | ||
| this.fromBlock = fromBlock; | ||
| this.toBlock = toBlock; | ||
| this.addresses = addresses; | ||
| this.topics = topics; | ||
| this.blockhash = blockhash; | ||
| } | ||
|
|
||
| public String getFromBlock() { | ||
| return fromBlock; | ||
| } | ||
|
|
||
| public String getToBlock() { | ||
| return toBlock; | ||
| } | ||
|
|
||
| public List<String> getAddresses() { | ||
| return addresses; | ||
| } | ||
|
|
||
| public List<List<String>> getTopics() { | ||
| return topics; | ||
| } | ||
|
|
||
| public String getBlockhash() { | ||
| return blockhash; | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
...org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetLogsTransaction.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter; | ||
| import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; | ||
| import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.web3j.protocol.core.methods.response.EthLog; | ||
|
|
||
| public class PrivGetLogsTransaction implements Transaction<EthLog> { | ||
|
|
||
| private final String privacyGroupId; | ||
| private final LogFilterJsonParameter filterParameter; | ||
|
|
||
| public PrivGetLogsTransaction( | ||
| final String privacyGroupId, final LogFilterJsonParameter filterParameter) { | ||
| this.privacyGroupId = privacyGroupId; | ||
| this.filterParameter = filterParameter; | ||
| } | ||
|
|
||
| @Override | ||
| public EthLog execute(final NodeRequests node) { | ||
| try { | ||
| final EthLog response = node.privacy().privGetLogs(privacyGroupId, filterParameter).send(); | ||
|
|
||
| assertThat(response).as("check response is not null").isNotNull(); | ||
| assertThat(response.getResult()).as("check result in response isn't null").isNotNull(); | ||
|
|
||
| return response; | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: can be final