build.gradle: Make protobuf-gradle-plugin use protoc from the repository.

This updates the protoc version to 3.6.1, fixing many warnings in the generated sources.
This commit is contained in:
Andreas Schildbach 2019-02-23 22:52:01 +01:00
parent 1d4c8e69eb
commit 81ddd50ffb
8 changed files with 2074 additions and 524 deletions

View file

@ -5,8 +5,7 @@ language: java
jdk:
- openjdk8
- openjdk11
install:
- sudo apt-get install -y protobuf-compiler
install: true
script:
# excluding wallet-template because of the unreliable JavaFX dependency
- gradle clean build -x :wallettemplate:compileJava

View file

@ -29,6 +29,9 @@ compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8'
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.6.1'
}
generatedFilesBaseDir = new File(projectDir, '/src') // workaround for '$projectDir/src'
}

View file

@ -57,6 +57,7 @@ public final class PeerSeedProtos {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeedData)
PeerSeedDataOrBuilder {
private static final long serialVersionUID = 0L;
// Use PeerSeedData.newBuilder() to construct.
private PeerSeedData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -77,6 +78,9 @@ public final class PeerSeedProtos {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -88,13 +92,6 @@ public final class PeerSeedProtos {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
@ -111,6 +108,13 @@ public final class PeerSeedProtos {
services_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -128,6 +132,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable
@ -209,6 +214,7 @@ public final class PeerSeedProtos {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -230,6 +236,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@ -244,6 +251,7 @@ public final class PeerSeedProtos {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -265,7 +273,6 @@ public final class PeerSeedProtos {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -302,7 +309,7 @@ public final class PeerSeedProtos {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (hasIpAddress()) {
hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER;
hash = (53 * hash) + getIpAddress().hashCode();
@ -320,6 +327,17 @@ public final class PeerSeedProtos {
return hash;
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -379,6 +397,7 @@ public final class PeerSeedProtos {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -386,6 +405,7 @@ public final class PeerSeedProtos {
public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -409,6 +429,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable
@ -431,6 +452,7 @@ public final class PeerSeedProtos {
.alwaysUseFieldBuilders) {
}
}
@java.lang.Override
public Builder clear() {
super.clear();
ipAddress_ = "";
@ -442,15 +464,18 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() {
return org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.getDefaultInstance();
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData build() {
org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = buildPartial();
if (!result.isInitialized()) {
@ -459,6 +484,7 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData buildPartial() {
org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeedData(this);
int from_bitField0_ = bitField0_;
@ -480,32 +506,39 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeedData) {
return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeedData)other);
@ -533,6 +566,7 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
if (!hasIpAddress()) {
return false;
@ -546,6 +580,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -704,11 +739,13 @@ public final class PeerSeedProtos {
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -730,11 +767,12 @@ public final class PeerSeedProtos {
@java.lang.Deprecated public static final com.google.protobuf.Parser<PeerSeedData>
PARSER = new com.google.protobuf.AbstractParser<PeerSeedData>() {
@java.lang.Override
public PeerSeedData parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new PeerSeedData(input, extensionRegistry);
return new PeerSeedData(input, extensionRegistry);
}
};
@ -747,6 +785,7 @@ public final class PeerSeedProtos {
return PARSER;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -819,6 +858,7 @@ public final class PeerSeedProtos {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeeds)
PeerSeedsOrBuilder {
private static final long serialVersionUID = 0L;
// Use PeerSeeds.newBuilder() to construct.
private PeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -839,6 +879,9 @@ public final class PeerSeedProtos {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -850,13 +893,6 @@ public final class PeerSeedProtos {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
seed_ = new java.util.ArrayList<org.bitcoin.crawler.PeerSeedProtos.PeerSeedData>();
@ -877,6 +913,13 @@ public final class PeerSeedProtos {
net_ = bs;
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -897,6 +940,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable
@ -1006,6 +1050,7 @@ public final class PeerSeedProtos {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -1029,6 +1074,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < seed_.size(); i++) {
@ -1043,6 +1089,7 @@ public final class PeerSeedProtos {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -1064,7 +1111,6 @@ public final class PeerSeedProtos {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -1098,7 +1144,7 @@ public final class PeerSeedProtos {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (getSeedCount() > 0) {
hash = (37 * hash) + SEED_FIELD_NUMBER;
hash = (53 * hash) + getSeedList().hashCode();
@ -1117,6 +1163,17 @@ public final class PeerSeedProtos {
return hash;
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -1176,6 +1233,7 @@ public final class PeerSeedProtos {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -1183,6 +1241,7 @@ public final class PeerSeedProtos {
public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeeds prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -1206,6 +1265,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable
@ -1229,6 +1289,7 @@ public final class PeerSeedProtos {
getSeedFieldBuilder();
}
}
@java.lang.Override
public Builder clear() {
super.clear();
if (seedBuilder_ == null) {
@ -1244,15 +1305,18 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() {
return org.bitcoin.crawler.PeerSeedProtos.PeerSeeds.getDefaultInstance();
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds build() {
org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = buildPartial();
if (!result.isInitialized()) {
@ -1261,6 +1325,7 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds buildPartial() {
org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeeds(this);
int from_bitField0_ = bitField0_;
@ -1287,32 +1352,39 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeeds) {
return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeeds)other);
@ -1363,6 +1435,7 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
if (!hasTimestamp()) {
return false;
@ -1378,6 +1451,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -1760,11 +1834,13 @@ public final class PeerSeedProtos {
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -1786,11 +1862,12 @@ public final class PeerSeedProtos {
@java.lang.Deprecated public static final com.google.protobuf.Parser<PeerSeeds>
PARSER = new com.google.protobuf.AbstractParser<PeerSeeds>() {
@java.lang.Override
public PeerSeeds parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new PeerSeeds(input, extensionRegistry);
return new PeerSeeds(input, extensionRegistry);
}
};
@ -1803,6 +1880,7 @@ public final class PeerSeedProtos {
return PARSER;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -1847,6 +1925,7 @@ public final class PeerSeedProtos {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:org.bitcoin.crawler.SignedPeerSeeds)
SignedPeerSeedsOrBuilder {
private static final long serialVersionUID = 0L;
// Use SignedPeerSeeds.newBuilder() to construct.
private SignedPeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -1867,6 +1946,9 @@ public final class PeerSeedProtos {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -1878,13 +1960,6 @@ public final class PeerSeedProtos {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
bitField0_ |= 0x00000001;
peerSeeds_ = input.readBytes();
@ -1900,6 +1975,13 @@ public final class PeerSeedProtos {
pubkey_ = input.readBytes();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -1917,6 +1999,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable
@ -1971,6 +2054,7 @@ public final class PeerSeedProtos {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -1992,6 +2076,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@ -2006,6 +2091,7 @@ public final class PeerSeedProtos {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -2028,7 +2114,6 @@ public final class PeerSeedProtos {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -2065,7 +2150,7 @@ public final class PeerSeedProtos {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerSeeds()) {
hash = (37 * hash) + PEER_SEEDS_FIELD_NUMBER;
hash = (53 * hash) + getPeerSeeds().hashCode();
@ -2083,6 +2168,17 @@ public final class PeerSeedProtos {
return hash;
}
public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -2142,6 +2238,7 @@ public final class PeerSeedProtos {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -2149,6 +2246,7 @@ public final class PeerSeedProtos {
public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -2172,6 +2270,7 @@ public final class PeerSeedProtos {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable
@ -2194,6 +2293,7 @@ public final class PeerSeedProtos {
.alwaysUseFieldBuilders) {
}
}
@java.lang.Override
public Builder clear() {
super.clear();
peerSeeds_ = com.google.protobuf.ByteString.EMPTY;
@ -2205,15 +2305,18 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() {
return org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds.getDefaultInstance();
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds build() {
org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = buildPartial();
if (!result.isInitialized()) {
@ -2222,6 +2325,7 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds buildPartial() {
org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds(this);
int from_bitField0_ = bitField0_;
@ -2243,32 +2347,39 @@ public final class PeerSeedProtos {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds) {
return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds)other);
@ -2294,6 +2405,7 @@ public final class PeerSeedProtos {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
if (!hasPeerSeeds()) {
return false;
@ -2307,6 +2419,7 @@ public final class PeerSeedProtos {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -2430,11 +2543,13 @@ public final class PeerSeedProtos {
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -2456,11 +2571,12 @@ public final class PeerSeedProtos {
@java.lang.Deprecated public static final com.google.protobuf.Parser<SignedPeerSeeds>
PARSER = new com.google.protobuf.AbstractParser<SignedPeerSeeds>() {
@java.lang.Override
public SignedPeerSeeds parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new SignedPeerSeeds(input, extensionRegistry);
return new SignedPeerSeeds(input, extensionRegistry);
}
};
@ -2473,6 +2589,7 @@ public final class PeerSeedProtos {
return PARSER;
}
@java.lang.Override
public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -53,6 +53,7 @@ public final class ClientState {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannels)
StoredClientPaymentChannelsOrBuilder {
private static final long serialVersionUID = 0L;
// Use StoredClientPaymentChannels.newBuilder() to construct.
private StoredClientPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -71,6 +72,9 @@ public final class ClientState {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -82,13 +86,6 @@ public final class ClientState {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
channels_ = new java.util.ArrayList<org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel>();
@ -98,6 +95,13 @@ public final class ClientState {
input.readMessage(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry));
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -118,6 +122,7 @@ public final class ClientState {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable
@ -161,6 +166,7 @@ public final class ClientState {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -176,6 +182,7 @@ public final class ClientState {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < channels_.size(); i++) {
@ -184,6 +191,7 @@ public final class ClientState {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -198,7 +206,6 @@ public final class ClientState {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -222,7 +229,7 @@ public final class ClientState {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (getChannelsCount() > 0) {
hash = (37 * hash) + CHANNELS_FIELD_NUMBER;
hash = (53 * hash) + getChannelsList().hashCode();
@ -232,6 +239,17 @@ public final class ClientState {
return hash;
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -291,6 +309,7 @@ public final class ClientState {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -298,6 +317,7 @@ public final class ClientState {
public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -325,6 +345,7 @@ public final class ClientState {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable
@ -348,6 +369,7 @@ public final class ClientState {
getChannelsFieldBuilder();
}
}
@java.lang.Override
public Builder clear() {
super.clear();
if (channelsBuilder_ == null) {
@ -359,15 +381,18 @@ public final class ClientState {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() {
return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance();
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels build() {
org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = buildPartial();
if (!result.isInitialized()) {
@ -376,6 +401,7 @@ public final class ClientState {
return result;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels buildPartial() {
org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels(this);
int from_bitField0_ = bitField0_;
@ -392,32 +418,39 @@ public final class ClientState {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) {
return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels)other);
@ -460,6 +493,7 @@ public final class ClientState {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
for (int i = 0; i < getChannelsCount(); i++) {
if (!getChannels(i).isInitialized()) {
@ -469,6 +503,7 @@ public final class ClientState {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -727,11 +762,13 @@ public final class ClientState {
}
return channelsBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -753,11 +790,12 @@ public final class ClientState {
@java.lang.Deprecated public static final com.google.protobuf.Parser<StoredClientPaymentChannels>
PARSER = new com.google.protobuf.AbstractParser<StoredClientPaymentChannels>() {
@java.lang.Override
public StoredClientPaymentChannels parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new StoredClientPaymentChannels(input, extensionRegistry);
return new StoredClientPaymentChannels(input, extensionRegistry);
}
};
@ -770,6 +808,7 @@ public final class ClientState {
return PARSER;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -935,6 +974,7 @@ public final class ClientState {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannel)
StoredClientPaymentChannelOrBuilder {
private static final long serialVersionUID = 0L;
// Use StoredClientPaymentChannel.newBuilder() to construct.
private StoredClientPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -963,6 +1003,9 @@ public final class ClientState {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -974,13 +1017,6 @@ public final class ClientState {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
bitField0_ |= 0x00000001;
id_ = input.readBytes();
@ -1036,6 +1072,13 @@ public final class ClientState {
serverKey_ = input.readBytes();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -1053,6 +1096,7 @@ public final class ClientState {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable
@ -1271,6 +1315,7 @@ public final class ClientState {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -1308,6 +1353,7 @@ public final class ClientState {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@ -1346,6 +1392,7 @@ public final class ClientState {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -1400,7 +1447,6 @@ public final class ClientState {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -1477,7 +1523,7 @@ public final class ClientState {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (hasId()) {
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId().hashCode();
@ -1530,6 +1576,17 @@ public final class ClientState {
return hash;
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -1589,6 +1646,7 @@ public final class ClientState {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -1596,6 +1654,7 @@ public final class ClientState {
public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -1624,6 +1683,7 @@ public final class ClientState {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable
@ -1646,6 +1706,7 @@ public final class ClientState {
.alwaysUseFieldBuilders) {
}
}
@java.lang.Override
public Builder clear() {
super.clear();
id_ = com.google.protobuf.ByteString.EMPTY;
@ -1673,15 +1734,18 @@ public final class ClientState {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() {
return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance();
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel build() {
org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = buildPartial();
if (!result.isInitialized()) {
@ -1690,6 +1754,7 @@ public final class ClientState {
return result;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel buildPartial() {
org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel(this);
int from_bitField0_ = bitField0_;
@ -1743,32 +1808,39 @@ public final class ClientState {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) {
return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel)other);
@ -1818,6 +1890,7 @@ public final class ClientState {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
if (!hasId()) {
return false;
@ -1843,6 +1916,7 @@ public final class ClientState {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -2322,11 +2396,13 @@ public final class ClientState {
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -2348,11 +2424,12 @@ public final class ClientState {
@java.lang.Deprecated public static final com.google.protobuf.Parser<StoredClientPaymentChannel>
PARSER = new com.google.protobuf.AbstractParser<StoredClientPaymentChannel>() {
@java.lang.Override
public StoredClientPaymentChannel parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new StoredClientPaymentChannel(input, extensionRegistry);
return new StoredClientPaymentChannel(input, extensionRegistry);
}
};
@ -2365,6 +2442,7 @@ public final class ClientState {
return PARSER;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -2399,7 +2477,7 @@ public final class ClientState {
" \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r\n\005myKey\030\004 \002(\014" +
"\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFees\030\006 \002(\004\022" +
"\034\n\024closeTransactionHash\030\007 \001(\014\022\027\n\014majorVe" +
"rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse",
"rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse" +
"rverKey\030\013 \001(\014B.\n\037org.bitcoinj.protocols." +
"channelsB\013ClientState"
};

View file

@ -53,6 +53,7 @@ public final class ServerState {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannels)
StoredServerPaymentChannelsOrBuilder {
private static final long serialVersionUID = 0L;
// Use StoredServerPaymentChannels.newBuilder() to construct.
private StoredServerPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -71,6 +72,9 @@ public final class ServerState {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -82,13 +86,6 @@ public final class ServerState {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
channels_ = new java.util.ArrayList<org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel>();
@ -98,6 +95,13 @@ public final class ServerState {
input.readMessage(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry));
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -118,6 +122,7 @@ public final class ServerState {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable
@ -161,6 +166,7 @@ public final class ServerState {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -176,6 +182,7 @@ public final class ServerState {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < channels_.size(); i++) {
@ -184,6 +191,7 @@ public final class ServerState {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -198,7 +206,6 @@ public final class ServerState {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -222,7 +229,7 @@ public final class ServerState {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (getChannelsCount() > 0) {
hash = (37 * hash) + CHANNELS_FIELD_NUMBER;
hash = (53 * hash) + getChannelsList().hashCode();
@ -232,6 +239,17 @@ public final class ServerState {
return hash;
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -291,6 +309,7 @@ public final class ServerState {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -298,6 +317,7 @@ public final class ServerState {
public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -325,6 +345,7 @@ public final class ServerState {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable
@ -348,6 +369,7 @@ public final class ServerState {
getChannelsFieldBuilder();
}
}
@java.lang.Override
public Builder clear() {
super.clear();
if (channelsBuilder_ == null) {
@ -359,15 +381,18 @@ public final class ServerState {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() {
return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance();
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels build() {
org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = buildPartial();
if (!result.isInitialized()) {
@ -376,6 +401,7 @@ public final class ServerState {
return result;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels buildPartial() {
org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels(this);
int from_bitField0_ = bitField0_;
@ -392,32 +418,39 @@ public final class ServerState {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) {
return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels)other);
@ -460,6 +493,7 @@ public final class ServerState {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
for (int i = 0; i < getChannelsCount(); i++) {
if (!getChannels(i).isInitialized()) {
@ -469,6 +503,7 @@ public final class ServerState {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -727,11 +762,13 @@ public final class ServerState {
}
return channelsBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -753,11 +790,12 @@ public final class ServerState {
@java.lang.Deprecated public static final com.google.protobuf.Parser<StoredServerPaymentChannels>
PARSER = new com.google.protobuf.AbstractParser<StoredServerPaymentChannels>() {
@java.lang.Override
public StoredServerPaymentChannels parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new StoredServerPaymentChannels(input, extensionRegistry);
return new StoredServerPaymentChannels(input, extensionRegistry);
}
};
@ -770,6 +808,7 @@ public final class ServerState {
return PARSER;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -871,6 +910,7 @@ public final class ServerState {
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannel)
StoredServerPaymentChannelOrBuilder {
private static final long serialVersionUID = 0L;
// Use StoredServerPaymentChannel.newBuilder() to construct.
private StoredServerPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
@ -896,6 +936,9 @@ public final class ServerState {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
@ -907,13 +950,6 @@ public final class ServerState {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 8: {
bitField0_ |= 0x00000001;
bestValueToMe_ = input.readUInt64();
@ -954,6 +990,13 @@ public final class ServerState {
clientKey_ = input.readBytes();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -971,6 +1014,7 @@ public final class ServerState {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable
@ -1108,6 +1152,7 @@ public final class ServerState {
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@ -1133,6 +1178,7 @@ public final class ServerState {
return true;
}
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@ -1162,6 +1208,7 @@ public final class ServerState {
unknownFields.writeTo(output);
}
@java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@ -1204,7 +1251,6 @@ public final class ServerState {
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@ -1266,7 +1312,7 @@ public final class ServerState {
return memoizedHashCode;
}
int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode();
hash = (19 * hash) + getDescriptor().hashCode();
if (hasBestValueToMe()) {
hash = (37 * hash) + BESTVALUETOME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@ -1306,6 +1352,17 @@ public final class ServerState {
return hash;
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@ -1365,6 +1422,7 @@ public final class ServerState {
.parseWithIOException(PARSER, input, extensionRegistry);
}
@java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
@ -1372,6 +1430,7 @@ public final class ServerState {
public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
@ -1399,6 +1458,7 @@ public final class ServerState {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable
@ -1421,6 +1481,7 @@ public final class ServerState {
.alwaysUseFieldBuilders) {
}
}
@java.lang.Override
public Builder clear() {
super.clear();
bestValueToMe_ = 0L;
@ -1442,15 +1503,18 @@ public final class ServerState {
return this;
}
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() {
return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance();
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel build() {
org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = buildPartial();
if (!result.isInitialized()) {
@ -1459,6 +1523,7 @@ public final class ServerState {
return result;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel buildPartial() {
org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel(this);
int from_bitField0_ = bitField0_;
@ -1500,32 +1565,39 @@ public final class ServerState {
return result;
}
@java.lang.Override
public Builder clone() {
return (Builder) super.clone();
}
@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return (Builder) super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return (Builder) super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index, Object value) {
int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
Object value) {
java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) {
return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel)other);
@ -1566,6 +1638,7 @@ public final class ServerState {
return this;
}
@java.lang.Override
public final boolean isInitialized() {
if (!hasBestValueToMe()) {
return false;
@ -1582,6 +1655,7 @@ public final class ServerState {
return true;
}
@java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@ -1887,11 +1961,13 @@ public final class ServerState {
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@ -1913,11 +1989,12 @@ public final class ServerState {
@java.lang.Deprecated public static final com.google.protobuf.Parser<StoredServerPaymentChannel>
PARSER = new com.google.protobuf.AbstractParser<StoredServerPaymentChannel>() {
@java.lang.Override
public StoredServerPaymentChannel parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new StoredServerPaymentChannel(input, extensionRegistry);
return new StoredServerPaymentChannel(input, extensionRegistry);
}
};
@ -1930,6 +2007,7 @@ public final class ServerState {
return PARSER;
}
@java.lang.Override
public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -1964,7 +2042,7 @@ public final class ServerState {
"nsactionUnlockTimeSecs\030\003 \002(\004\022\033\n\023contract" +
"Transaction\030\004 \002(\014\022\024\n\014clientOutput\030\005 \001(\014\022" +
"\r\n\005myKey\030\006 \002(\014\022\027\n\014majorVersion\030\007 \001(\r:\0011\022" +
"\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto",
"\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto" +
"cols.channelsB\013ServerState"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =

File diff suppressed because it is too large Load diff