forked from PegaSysEng/pantheon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PAN-2996] Remove enclave public key from parameter (PegaSysEng#1789)
- Loading branch information
1 parent
fc6afda
commit 09c1da9
Showing
14 changed files
with
400 additions
and
95 deletions.
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
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
48 changes: 48 additions & 0 deletions
48
...sys/pantheon/tests/acceptance/dsl/transaction/priv/PrivCreatePrivacyGroupTransaction.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,48 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.priv; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; | ||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| public class PrivCreatePrivacyGroupTransaction implements Transaction<String> { | ||
|
|
||
| private final List<String> addresses; | ||
| private final String name; | ||
| private final String description; | ||
|
|
||
| public PrivCreatePrivacyGroupTransaction( | ||
| final List<String> addresses, final String name, final String description) { | ||
|
|
||
| this.addresses = addresses; | ||
| this.name = name; | ||
| this.description = description; | ||
| } | ||
|
|
||
| @Override | ||
| public String execute(final NodeRequests node) { | ||
| try { | ||
| PrivRequestFactory.PrivCreatePrivacyGroupResponse result = | ||
| node.priv().privCreatePrivacyGroup(addresses, name, description).send(); | ||
| assertThat(result).isNotNull(); | ||
| return result.getResult(); | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
...ceptance/dsl/transaction/priv/PrivCreatePrivacyGroupWithoutOptionalParamsTransaction.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,43 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.priv; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; | ||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| public class PrivCreatePrivacyGroupWithoutOptionalParamsTransaction implements Transaction<String> { | ||
|
|
||
| private final List<String> addresses; | ||
|
|
||
| public PrivCreatePrivacyGroupWithoutOptionalParamsTransaction(final List<String> addresses) { | ||
|
|
||
| this.addresses = addresses; | ||
| } | ||
|
|
||
| @Override | ||
| public String execute(final NodeRequests node) { | ||
| try { | ||
| PrivRequestFactory.PrivCreatePrivacyGroupResponse result = | ||
| node.priv().privCreatePrivacyGroupWithoutOptionalParams(addresses).send(); | ||
| assertThat(result).isNotNull(); | ||
| return result.getResult(); | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
...gasys/pantheon/tests/acceptance/dsl/transaction/priv/PrivFindPrivacyGroupTransaction.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,44 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.priv; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import tech.pegasys.pantheon.enclave.types.PrivacyGroup; | ||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; | ||
| import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| public class PrivFindPrivacyGroupTransaction implements Transaction<List<PrivacyGroup>> { | ||
|
|
||
| private final List<String> addresses; | ||
|
|
||
| public PrivFindPrivacyGroupTransaction(final List<String> addresses) { | ||
|
|
||
| this.addresses = addresses; | ||
| } | ||
|
|
||
| @Override | ||
| public List<PrivacyGroup> execute(final NodeRequests node) { | ||
| try { | ||
| PrivRequestFactory.PrivFindPrivacyGroupResponse result = | ||
| node.priv().privFindPrivacyGroup(addresses).send(); | ||
| assertThat(result).isNotNull(); | ||
| return result.getResult(); | ||
| } 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
73 changes: 73 additions & 0 deletions
73
.../java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/priv/PrivRequestFactory.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,73 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.priv; | ||
|
|
||
| import tech.pegasys.pantheon.enclave.types.PrivacyGroup; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.assertj.core.util.Lists; | ||
| import org.web3j.protocol.Web3jService; | ||
| import org.web3j.protocol.core.Request; | ||
| import org.web3j.protocol.core.Response; | ||
| import org.web3j.protocol.core.methods.response.EthGetTransactionCount; | ||
|
|
||
| public class PrivRequestFactory { | ||
|
|
||
| public static class PrivCreatePrivacyGroupResponse extends Response<String> {} | ||
|
|
||
| public static class PrivFindPrivacyGroupResponse extends Response<List<PrivacyGroup>> {} | ||
|
|
||
| private final Web3jService web3jService; | ||
|
|
||
| public PrivRequestFactory(final Web3jService web3jService) { | ||
| this.web3jService = web3jService; | ||
| } | ||
|
|
||
| public Request<?, EthGetTransactionCount> privGetTransactionCount( | ||
| final String accountAddress, final String privacyGroupId) { | ||
| return new Request<>( | ||
| "priv_getTransactionCount", | ||
| Lists.newArrayList(accountAddress, privacyGroupId), | ||
| web3jService, | ||
| EthGetTransactionCount.class); | ||
| } | ||
|
|
||
| public Request<?, PrivCreatePrivacyGroupResponse> privCreatePrivacyGroup( | ||
| final List<String> addresses, final String name, final String description) { | ||
| return new Request<>( | ||
| "priv_createPrivacyGroup", | ||
| Lists.newArrayList(addresses, name, description), | ||
| web3jService, | ||
| PrivCreatePrivacyGroupResponse.class); | ||
| } | ||
|
|
||
| public Request<?, PrivCreatePrivacyGroupResponse> privCreatePrivacyGroupWithoutOptionalParams( | ||
| final List<String> addresses) { | ||
| return new Request<>( | ||
| "priv_createPrivacyGroup", | ||
| Collections.singletonList(addresses), | ||
| web3jService, | ||
| PrivCreatePrivacyGroupResponse.class); | ||
| } | ||
|
|
||
| public Request<?, PrivFindPrivacyGroupResponse> privFindPrivacyGroup( | ||
| final List<String> addresses) { | ||
| return new Request<>( | ||
| "priv_findPrivacyGroup", | ||
| Collections.singletonList(addresses), | ||
| web3jService, | ||
| PrivFindPrivacyGroupResponse.class); | ||
| } | ||
| } |
Oops, something went wrong.