Skip to content

Commit

Permalink
[MINOR] (privacy deprecation) correct target to 24.12.0 (hyperledger#…
Browse files Browse the repository at this point in the history
…7953)

Signed-off-by: Ameziane H. <[email protected]>
  • Loading branch information
macfarla authored and ahamlat committed Dec 2, 2024
1 parent 812bafe commit ab86b6c
Show file tree
Hide file tree
Showing 40 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class TestPrivacyPluginPayloadProvider implements PrivacyPluginPayloadProvider {
private static final Logger LOG = LoggerFactory.getLogger(TestPrivacyPluginPayloadProvider.class);
private String prefix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import static picocli.CommandLine.Option;

/** The Privacy plugin Cli options. */
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginOptions {
/** Default Constructor. */
PrivacyPluginOptions() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.slf4j.LoggerFactory;

/** The Privacy plugin service implementation. */
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginServiceImpl implements PrivacyPluginService {
private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginServiceImpl.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class DisabledPrivacyRpcMethod implements JsonRpcMethod {

private final String methodName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class MultiTenancyRpcMethodDecorator implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(MultiTenancyRpcMethodDecorator.class);
private final JsonRpcMethod rpcMethod;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import io.vertx.ext.auth.User;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class MultiTenancyUserUtil {
private static final String PRIVACY_USER_ID_CLAIM = "privacyUserId";
private static final String ENCLAVE_PRIVACY_PUBLIC_KEY_CLAIM = "privacyPublicKey";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import java.util.List;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetFilterChanges implements JsonRpcMethod {

private final PrivacyController privacyController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import java.util.List;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetFilterLogs implements JsonRpcMethod {

private final PrivacyController privacyController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
import org.hyperledger.besu.ethereum.privacy.PrivacyController;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivUninstallFilter implements JsonRpcMethod {

private final FilterManager filterManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import io.vertx.ext.auth.User;

@FunctionalInterface
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyIdProvider {

String getPrivacyUserId(Optional<User> user);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class AbstractEeaSendRawTransaction implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(AbstractEeaSendRawTransaction.class);
private final TransactionPool transactionPool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class JsonRpcErrorResponseException extends RuntimeException {

private final RpcErrorType jsonRpcError;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PluginEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
private final PrivacyController privacyController;
private final PrivacyIdProvider privacyIdProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class RestrictedFlexibleEeaSendRawTransaction extends AbstractEeaSendRawTransaction {

private final PrivacyController privacyController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import io.vertx.ext.auth.User;
import org.apache.tuweni.bytes.Bytes;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class RestrictedOffchainEeaSendRawTransaction extends AbstractEeaSendRawTransaction {

final PrivacyController privacyController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import java.util.function.Supplier;
import java.util.stream.Stream;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class AbstractPrivateTraceByHash implements JsonRpcMethod {

protected final Supplier<PrivateBlockTracer> blockTracerSupplier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivCall extends AbstractBlockParameterMethod {

private final PrivacyIdProvider privacyIdProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivCreatePrivacyGroup implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivCreatePrivacyGroup.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDebugGetStateRoot extends AbstractBlockParameterMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivDebugGetStateRoot.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDeletePrivacyGroup implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivDeletePrivacyGroup.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivDistributeRawTransaction implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivDistributeRawTransaction.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.slf4j.LoggerFactory;

@SuppressWarnings("MockNotUsedInProduction")
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivFindPrivacyGroup implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivFindPrivacyGroup.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import org.apache.tuweni.bytes.Bytes;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetCode extends AbstractBlockParameterMethod {

private final PrivacyController privacyController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetEeaTransactionCount implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivGetEeaTransactionCount.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import java.util.List;
import java.util.Optional;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetLogs implements JsonRpcMethod {

private final BlockchainQueries blockchainQueries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetPrivacyPrecompileAddress implements JsonRpcMethod {

private final Address privacyAddress;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetPrivateTransaction implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivGetPrivateTransaction.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetTransactionCount implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionCount.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivGetTransactionReceipt implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionReceipt.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
import org.hyperledger.besu.ethereum.privacy.PrivacyController;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivNewFilter implements JsonRpcMethod {

private final FilterManager filterManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivTraceTransaction extends AbstractPrivateTraceByHash implements JsonRpcMethod {
private static final Logger LOG = LoggerFactory.getLogger(TraceTransaction.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.util.Optional;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivUtil {

public static void checkMembershipForAuthenticatedUser(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivxFindFlexiblePrivacyGroup implements JsonRpcMethod {

private static final Logger LOG = LoggerFactory.getLogger(PrivxFindFlexiblePrivacyGroup.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class CreatePrivacyGroupParameter {

private final List<String> addresses;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

import java.util.Map;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivJsonRpcMethods extends PrivacyApiGroupJsonRpcMethods {

private final FilterManager filterManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import java.util.Optional;
import java.util.stream.Collectors;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public abstract class PrivacyApiGroupJsonRpcMethods extends ApiGroupJsonRpcMethods {

private final BlockchainQueries blockchainQueries;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public class PrivacyPluginPrecompiledContract extends PrivacyPrecompiledContract {
private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginPrecompiledContract.class);
private final PrivacyParameters privacyParameters;
Expand Down
2 changes: 1 addition & 1 deletion plugin-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Calculated : ${currentHash}
tasks.register('checkAPIChanges', FileStateChecker) {
description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
files = sourceSets.main.allJava.files
knownHash = 'f6fi+lsYVZtFjmGOyiMPPCfNDie4SIPpj6HVgXRxF8Q='
knownHash = 'bULFOchupNjcCw+oZ4tykpgxzL4vsOTtDPimyiKGF98='
}
check.dependsOn('checkAPIChanges')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* optionally register a {@link PrivateMarkerTransactionFactory} and a {@link
* PrivacyGroupGenesisProvider}*
*/
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyPluginService extends BesuService {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Allows you to register a provider that will dictate how the payload of a privacy marker
* transaction is handled.
*/
@Deprecated(since = "24.11.0")
@Deprecated(since = "24.12.0")
public interface PrivacyPluginPayloadProvider {

/**
Expand Down

0 comments on commit ab86b6c

Please sign in to comment.