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

[PAN-2971] Remove enclave public key from parameter #1777

Merged
merged 2 commits into from
Jul 29, 2019
Merged

[PAN-2971] Remove enclave public key from parameter #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a7d48
Remove enclave public key from parameter
iikirilov Jul 29, 2019
a166045
Merge branch 'master' into PAN-2971
lucassaldanha Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...m/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ blockchainQueries, new TransactionTracer(blockReplay), parameter),
addMethods(
enabledMethods,
new PrivCreatePrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),
new PrivDeletePrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),
new PrivDeletePrivacyGroup(
new Enclave(privacyParameters.getEnclaveUri()), privacyParameters, parameter),
new PrivFindPrivacyGroup(new Enclave(privacyParameters.getEnclaveUri()), parameter),
new PrivGetPrivacyPrecompileAddress(privacyParameters),
new PrivGetTransactionCount(parameter, privateTransactionHandler),
Expand Down
18 changes: 13 additions & 5 deletions ...gasys/pantheon/ethereum/jsonrpc/internal/methods/privacy/priv/PrivDeletePrivacyGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import tech.pegasys.pantheon.enclave.Enclave;
import tech.pegasys.pantheon.enclave.types.DeletePrivacyGroupRequest;
import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
import tech.pegasys.pantheon.ethereum.jsonrpc.RpcMethod;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest;
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod;
Expand All @@ -30,10 +31,15 @@ public class PrivDeletePrivacyGroup implements JsonRpcMethod {

private static final Logger LOG = getLogger();
private final Enclave enclave;
private PrivacyParameters privacyParameters;
private final JsonRpcParameter parameters;

public PrivDeletePrivacyGroup(final Enclave enclave, final JsonRpcParameter parameters) {
public PrivDeletePrivacyGroup(
final Enclave enclave,
final PrivacyParameters privacyParameters,
final JsonRpcParameter parameters) {
this.enclave = enclave;
this.privacyParameters = privacyParameters;
this.parameters = parameters;
}

Expand All @@ -46,13 +52,15 @@ public String getName() {
public JsonRpcResponse response(final JsonRpcRequest request) {
LOG.trace("Executing {}", RpcMethod.PRIV_DELETE_PRIVACY_GROUP.getMethodName());

final String privacyGroupId = parameters.required(request.getParams(), 1, String.class);
final String from = parameters.required(request.getParams(), 0, String.class);
final String privacyGroupId = parameters.required(request.getParams(), 0, String.class);

LOG.trace("Deleting a privacy group with privacyGroupId {} and from {}", privacyGroupId, from);
LOG.trace(
"Deleting a privacy group with privacyGroupId {} and from {}",
privacyGroupId,
privacyParameters.getEnclavePublicKey());

DeletePrivacyGroupRequest deletePrivacyGroupRequest =
new DeletePrivacyGroupRequest(privacyGroupId, from);
new DeletePrivacyGroupRequest(privacyGroupId, privacyParameters.getEnclavePublicKey());
String response;
try {
response = enclave.deletePrivacyGroup(deletePrivacyGroupRequest);
Expand Down