Skip to content

Commit

Permalink
fix: remove GetValidators rpc method (#573)
Browse files Browse the repository at this point in the history
* fix: Remove GetValidators rpc definition

* fix: Remove GetValidators test code

* fix: Remove GetValidators in generated file
  • Loading branch information
ambersun1234 authored Jul 5, 2023
1 parent 2167ca9 commit a967da4
Show file tree
Hide file tree
Showing 19 changed files with 1,089 additions and 3,135 deletions.
5 changes: 0 additions & 5 deletions wallet/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ func (s *blockchainServer) GetValidator(_ context.Context,
return nil, fmt.Errorf("unknown request")
}

func (s *blockchainServer) GetValidators(_ context.Context,
_ *pactus.GetValidatorsRequest) (*pactus.GetValidatorsResponse, error) {
return nil, nil
}

func (s *transactionServer) GetTransaction(_ context.Context,
_ *pactus.GetTransactionRequest) (*pactus.GetTransactionResponse, error) {
return nil, nil
Expand Down
10 changes: 0 additions & 10 deletions www/grpc/blockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,16 +212,6 @@ func (s *blockchainServer) GetValidator(_ context.Context,
}, nil
}

func (s *blockchainServer) GetValidators(_ context.Context,
_ *pactus.GetValidatorsRequest) (*pactus.GetValidatorsResponse, error) {
validators := s.state.CommitteeValidators()
validatorsInfo := make([]*pactus.ValidatorInfo, 0, len(validators))
for _, val := range validators {
validatorsInfo = append(validatorsInfo, validatorToProto(val))
}
return &pactus.GetValidatorsResponse{Validators: validatorsInfo}, nil
}

func (s *blockchainServer) GetValidatorAddresses(_ context.Context,
_ *pactus.GetValidatorAddressesRequest) (*pactus.GetValidatorAddressesResponse, error) {
addresses := s.state.ValidatorAddresses()
Expand Down
15 changes: 0 additions & 15 deletions www/grpc/blockchain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,21 +285,6 @@ func TestGetValidatorByNumber(t *testing.T) {
assert.Nil(t, conn.Close(), "Error closing connection")
}

func TestGetValidators(t *testing.T) {
conn, client := testBlockchainClient(t)

t.Run("should return list of validators", func(t *testing.T) {
res, err := client.GetValidators(tCtx,
&pactus.GetValidatorsRequest{})

assert.NoError(t, err)
assert.NotNil(t, res)
assert.Equal(t, 21, len(res.GetValidators()))
})

assert.Nil(t, conn.Close(), "Error closing connection")
}

func TestGetValidatorAddresses(t *testing.T) {
conn, client := testBlockchainClient(t)

Expand Down
74 changes: 0 additions & 74 deletions www/grpc/gen/dart/blockchain.pb.dart
Original file line number Diff line number Diff line change
Expand Up @@ -160,35 +160,6 @@ class GetAccountResponse extends $pb.GeneratedMessage {
AccountInfo ensureAccount() => $_ensure(0);
}

class GetValidatorsRequest extends $pb.GeneratedMessage {
static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetValidatorsRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'pactus'), createEmptyInstance: create)
..hasRequiredFields = false
;

GetValidatorsRequest._() : super();
factory GetValidatorsRequest() => create();
factory GetValidatorsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
factory GetValidatorsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
@$core.Deprecated(
'Using this can add significant overhead to your binary. '
'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
'Will be removed in next major version')
GetValidatorsRequest clone() => GetValidatorsRequest()..mergeFromMessage(this);
@$core.Deprecated(
'Using this can add significant overhead to your binary. '
'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
'Will be removed in next major version')
GetValidatorsRequest copyWith(void Function(GetValidatorsRequest) updates) => super.copyWith((message) => updates(message as GetValidatorsRequest)) as GetValidatorsRequest; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static GetValidatorsRequest create() => GetValidatorsRequest._();
GetValidatorsRequest createEmptyInstance() => create();
static $pb.PbList<GetValidatorsRequest> createRepeated() => $pb.PbList<GetValidatorsRequest>();
@$core.pragma('dart2js:noInline')
static GetValidatorsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetValidatorsRequest>(create);
static GetValidatorsRequest? _defaultInstance;
}

class GetValidatorAddressesRequest extends $pb.GeneratedMessage {
static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetValidatorAddressesRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'pactus'), createEmptyInstance: create)
..hasRequiredFields = false
Expand Down Expand Up @@ -353,47 +324,6 @@ class GetValidatorByNumberRequest extends $pb.GeneratedMessage {
void clearNumber() => clearField(1);
}

class GetValidatorsResponse extends $pb.GeneratedMessage {
static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetValidatorsResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'pactus'), createEmptyInstance: create)
..pc<ValidatorInfo>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'validators', $pb.PbFieldType.PM, subBuilder: ValidatorInfo.create)
..hasRequiredFields = false
;

GetValidatorsResponse._() : super();
factory GetValidatorsResponse({
$core.Iterable<ValidatorInfo>? validators,
}) {
final _result = create();
if (validators != null) {
_result.validators.addAll(validators);
}
return _result;
}
factory GetValidatorsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
factory GetValidatorsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
@$core.Deprecated(
'Using this can add significant overhead to your binary. '
'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
'Will be removed in next major version')
GetValidatorsResponse clone() => GetValidatorsResponse()..mergeFromMessage(this);
@$core.Deprecated(
'Using this can add significant overhead to your binary. '
'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
'Will be removed in next major version')
GetValidatorsResponse copyWith(void Function(GetValidatorsResponse) updates) => super.copyWith((message) => updates(message as GetValidatorsResponse)) as GetValidatorsResponse; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static GetValidatorsResponse create() => GetValidatorsResponse._();
GetValidatorsResponse createEmptyInstance() => create();
static $pb.PbList<GetValidatorsResponse> createRepeated() => $pb.PbList<GetValidatorsResponse>();
@$core.pragma('dart2js:noInline')
static GetValidatorsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetValidatorsResponse>(create);
static GetValidatorsResponse? _defaultInstance;

@$pb.TagNumber(1)
$core.List<ValidatorInfo> get validators => $_getList(0);
}

class GetValidatorResponse extends $pb.GeneratedMessage {
static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetValidatorResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'pactus'), createEmptyInstance: create)
..aOM<ValidatorInfo>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'validator', subBuilder: ValidatorInfo.create)
Expand Down Expand Up @@ -1745,9 +1675,5 @@ class BlockchainApi {
var emptyResponse = GetValidatorAddressesResponse();
return _client.invoke<GetValidatorAddressesResponse>(ctx, 'Blockchain', 'GetValidatorAddresses', request, emptyResponse);
}
$async.Future<GetValidatorsResponse> getValidators($pb.ClientContext? ctx, GetValidatorsRequest request) {
var emptyResponse = GetValidatorsResponse();
return _client.invoke<GetValidatorsResponse>(ctx, 'Blockchain', 'GetValidators', request, emptyResponse);
}
}

22 changes: 1 addition & 21 deletions www/grpc/gen/dart/blockchain.pbjson.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,6 @@ const GetAccountResponse$json = const {

/// Descriptor for `GetAccountResponse`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List getAccountResponseDescriptor = $convert.base64Decode('ChJHZXRBY2NvdW50UmVzcG9uc2USLQoHYWNjb3VudBgBIAEoCzITLnBhY3R1cy5BY2NvdW50SW5mb1IHYWNjb3VudA==');
@$core.Deprecated('Use getValidatorsRequestDescriptor instead')
const GetValidatorsRequest$json = const {
'1': 'GetValidatorsRequest',
};

/// Descriptor for `GetValidatorsRequest`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List getValidatorsRequestDescriptor = $convert.base64Decode('ChRHZXRWYWxpZGF0b3JzUmVxdWVzdA==');
@$core.Deprecated('Use getValidatorAddressesRequestDescriptor instead')
const GetValidatorAddressesRequest$json = const {
'1': 'GetValidatorAddressesRequest',
Expand Down Expand Up @@ -109,16 +102,6 @@ const GetValidatorByNumberRequest$json = const {

/// Descriptor for `GetValidatorByNumberRequest`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List getValidatorByNumberRequestDescriptor = $convert.base64Decode('ChtHZXRWYWxpZGF0b3JCeU51bWJlclJlcXVlc3QSFgoGbnVtYmVyGAEgASgFUgZudW1iZXI=');
@$core.Deprecated('Use getValidatorsResponseDescriptor instead')
const GetValidatorsResponse$json = const {
'1': 'GetValidatorsResponse',
'2': const [
const {'1': 'validators', '3': 1, '4': 3, '5': 11, '6': '.pactus.ValidatorInfo', '10': 'validators'},
],
};

/// Descriptor for `GetValidatorsResponse`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List getValidatorsResponseDescriptor = $convert.base64Decode('ChVHZXRWYWxpZGF0b3JzUmVzcG9uc2USNQoKdmFsaWRhdG9ycxgBIAMoCzIVLnBhY3R1cy5WYWxpZGF0b3JJbmZvUgp2YWxpZGF0b3Jz');
@$core.Deprecated('Use getValidatorResponseDescriptor instead')
const GetValidatorResponse$json = const {
'1': 'GetValidatorResponse',
Expand Down Expand Up @@ -337,7 +320,6 @@ const $core.Map<$core.String, $core.dynamic> BlockchainServiceBase$json = const
const {'1': 'GetValidator', '2': '.pactus.GetValidatorRequest', '3': '.pactus.GetValidatorResponse'},
const {'1': 'GetValidatorByNumber', '2': '.pactus.GetValidatorByNumberRequest', '3': '.pactus.GetValidatorResponse'},
const {'1': 'GetValidatorAddresses', '2': '.pactus.GetValidatorAddressesRequest', '3': '.pactus.GetValidatorAddressesResponse'},
const {'1': 'GetValidators', '2': '.pactus.GetValidatorsRequest', '3': '.pactus.GetValidatorsResponse'},
],
};

Expand Down Expand Up @@ -373,9 +355,7 @@ const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>> Blockchain
'.pactus.GetValidatorByNumberRequest': GetValidatorByNumberRequest$json,
'.pactus.GetValidatorAddressesRequest': GetValidatorAddressesRequest$json,
'.pactus.GetValidatorAddressesResponse': GetValidatorAddressesResponse$json,
'.pactus.GetValidatorsRequest': GetValidatorsRequest$json,
'.pactus.GetValidatorsResponse': GetValidatorsResponse$json,
};

/// Descriptor for `Blockchain`. Decode as a `google.protobuf.ServiceDescriptorProto`.
final $typed_data.Uint8List blockchainServiceDescriptor = $convert.base64Decode('CgpCbG9ja2NoYWluEj0KCEdldEJsb2NrEhcucGFjdHVzLkdldEJsb2NrUmVxdWVzdBoYLnBhY3R1cy5HZXRCbG9ja1Jlc3BvbnNlEkkKDEdldEJsb2NrSGFzaBIbLnBhY3R1cy5HZXRCbG9ja0hhc2hSZXF1ZXN0GhwucGFjdHVzLkdldEJsb2NrSGFzaFJlc3BvbnNlEk8KDkdldEJsb2NrSGVpZ2h0Eh0ucGFjdHVzLkdldEJsb2NrSGVpZ2h0UmVxdWVzdBoeLnBhY3R1cy5HZXRCbG9ja0hlaWdodFJlc3BvbnNlElgKEUdldEJsb2NrY2hhaW5JbmZvEiAucGFjdHVzLkdldEJsb2NrY2hhaW5JbmZvUmVxdWVzdBohLnBhY3R1cy5HZXRCbG9ja2NoYWluSW5mb1Jlc3BvbnNlElUKEEdldENvbnNlbnN1c0luZm8SHy5wYWN0dXMuR2V0Q29uc2Vuc3VzSW5mb1JlcXVlc3QaIC5wYWN0dXMuR2V0Q29uc2Vuc3VzSW5mb1Jlc3BvbnNlEkMKCkdldEFjY291bnQSGS5wYWN0dXMuR2V0QWNjb3VudFJlcXVlc3QaGi5wYWN0dXMuR2V0QWNjb3VudFJlc3BvbnNlElMKEkdldEFjY291bnRCeU51bWJlchIhLnBhY3R1cy5HZXRBY2NvdW50QnlOdW1iZXJSZXF1ZXN0GhoucGFjdHVzLkdldEFjY291bnRSZXNwb25zZRJJCgxHZXRWYWxpZGF0b3ISGy5wYWN0dXMuR2V0VmFsaWRhdG9yUmVxdWVzdBocLnBhY3R1cy5HZXRWYWxpZGF0b3JSZXNwb25zZRJZChRHZXRWYWxpZGF0b3JCeU51bWJlchIjLnBhY3R1cy5HZXRWYWxpZGF0b3JCeU51bWJlclJlcXVlc3QaHC5wYWN0dXMuR2V0VmFsaWRhdG9yUmVzcG9uc2USZAoVR2V0VmFsaWRhdG9yQWRkcmVzc2VzEiQucGFjdHVzLkdldFZhbGlkYXRvckFkZHJlc3Nlc1JlcXVlc3QaJS5wYWN0dXMuR2V0VmFsaWRhdG9yQWRkcmVzc2VzUmVzcG9uc2USTAoNR2V0VmFsaWRhdG9ycxIcLnBhY3R1cy5HZXRWYWxpZGF0b3JzUmVxdWVzdBodLnBhY3R1cy5HZXRWYWxpZGF0b3JzUmVzcG9uc2U=');
final $typed_data.Uint8List blockchainServiceDescriptor = $convert.base64Decode('CgpCbG9ja2NoYWluEj0KCEdldEJsb2NrEhcucGFjdHVzLkdldEJsb2NrUmVxdWVzdBoYLnBhY3R1cy5HZXRCbG9ja1Jlc3BvbnNlEkkKDEdldEJsb2NrSGFzaBIbLnBhY3R1cy5HZXRCbG9ja0hhc2hSZXF1ZXN0GhwucGFjdHVzLkdldEJsb2NrSGFzaFJlc3BvbnNlEk8KDkdldEJsb2NrSGVpZ2h0Eh0ucGFjdHVzLkdldEJsb2NrSGVpZ2h0UmVxdWVzdBoeLnBhY3R1cy5HZXRCbG9ja0hlaWdodFJlc3BvbnNlElgKEUdldEJsb2NrY2hhaW5JbmZvEiAucGFjdHVzLkdldEJsb2NrY2hhaW5JbmZvUmVxdWVzdBohLnBhY3R1cy5HZXRCbG9ja2NoYWluSW5mb1Jlc3BvbnNlElUKEEdldENvbnNlbnN1c0luZm8SHy5wYWN0dXMuR2V0Q29uc2Vuc3VzSW5mb1JlcXVlc3QaIC5wYWN0dXMuR2V0Q29uc2Vuc3VzSW5mb1Jlc3BvbnNlEkMKCkdldEFjY291bnQSGS5wYWN0dXMuR2V0QWNjb3VudFJlcXVlc3QaGi5wYWN0dXMuR2V0QWNjb3VudFJlc3BvbnNlElMKEkdldEFjY291bnRCeU51bWJlchIhLnBhY3R1cy5HZXRBY2NvdW50QnlOdW1iZXJSZXF1ZXN0GhoucGFjdHVzLkdldEFjY291bnRSZXNwb25zZRJJCgxHZXRWYWxpZGF0b3ISGy5wYWN0dXMuR2V0VmFsaWRhdG9yUmVxdWVzdBocLnBhY3R1cy5HZXRWYWxpZGF0b3JSZXNwb25zZRJZChRHZXRWYWxpZGF0b3JCeU51bWJlchIjLnBhY3R1cy5HZXRWYWxpZGF0b3JCeU51bWJlclJlcXVlc3QaHC5wYWN0dXMuR2V0VmFsaWRhdG9yUmVzcG9uc2USZAoVR2V0VmFsaWRhdG9yQWRkcmVzc2VzEiQucGFjdHVzLkdldFZhbGlkYXRvckFkZHJlc3Nlc1JlcXVlc3QaJS5wYWN0dXMuR2V0VmFsaWRhdG9yQWRkcmVzc2VzUmVzcG9uc2U=');
3 changes: 0 additions & 3 deletions www/grpc/gen/dart/blockchain.pbserver.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ abstract class BlockchainServiceBase extends $pb.GeneratedService {
$async.Future<$1.GetValidatorResponse> getValidator($pb.ServerContext ctx, $1.GetValidatorRequest request);
$async.Future<$1.GetValidatorResponse> getValidatorByNumber($pb.ServerContext ctx, $1.GetValidatorByNumberRequest request);
$async.Future<$1.GetValidatorAddressesResponse> getValidatorAddresses($pb.ServerContext ctx, $1.GetValidatorAddressesRequest request);
$async.Future<$1.GetValidatorsResponse> getValidators($pb.ServerContext ctx, $1.GetValidatorsRequest request);

$pb.GeneratedMessage createRequest($core.String method) {
switch (method) {
Expand All @@ -40,7 +39,6 @@ abstract class BlockchainServiceBase extends $pb.GeneratedService {
case 'GetValidator': return $1.GetValidatorRequest();
case 'GetValidatorByNumber': return $1.GetValidatorByNumberRequest();
case 'GetValidatorAddresses': return $1.GetValidatorAddressesRequest();
case 'GetValidators': return $1.GetValidatorsRequest();
default: throw $core.ArgumentError('Unknown method: $method');
}
}
Expand All @@ -57,7 +55,6 @@ abstract class BlockchainServiceBase extends $pb.GeneratedService {
case 'GetValidator': return this.getValidator(ctx, request as $1.GetValidatorRequest);
case 'GetValidatorByNumber': return this.getValidatorByNumber(ctx, request as $1.GetValidatorByNumberRequest);
case 'GetValidatorAddresses': return this.getValidatorAddresses(ctx, request as $1.GetValidatorAddressesRequest);
case 'GetValidators': return this.getValidators(ctx, request as $1.GetValidatorsRequest);
default: throw $core.ArgumentError('Unknown method: $method');
}
}
Expand Down
Loading

0 comments on commit a967da4

Please sign in to comment.