- getServicesNamesList();
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @return The count of servicesNames.
- */
- int getServicesNamesCount();
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the element to return.
- * @return The servicesNames at the given index.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The servicesNames.
*/
- java.lang.String getServicesNames(int index);
+ java.lang.String getServicesNames();
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the value to return.
- * @return The bytes of the servicesNames at the given index.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The bytes for servicesNames.
*/
com.google.protobuf.ByteString
- getServicesNamesBytes(int index);
+ getServicesNamesBytes();
/**
*
@@ -3988,8 +3948,7 @@ private GetNodeInfoResponse() {
agent_ = "";
peerId_ = "";
reachability_ = "";
- services_ = emptyIntList();
- servicesNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ servicesNames_ = "";
localAddrs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
protocols_ = com.google.protobuf.LazyStringArrayList.EMPTY;
}
@@ -4219,94 +4178,64 @@ public java.lang.String getReachability() {
}
public static final int SERVICES_FIELD_NUMBER = 6;
- private com.google.protobuf.Internal.IntList services_;
+ private int services_;
/**
*
- * List of services provided by the node.
+ * A bitfield indicating the services provided by the node.
*
*
- * repeated int32 services = 6 [json_name = "services"];
- * @return A list containing the services.
+ * int32 services = 6 [json_name = "services"];
+ * @return The services.
*/
@java.lang.Override
- public java.util.List
- getServicesList() {
+ public int getServices() {
return services_;
}
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @return The count of services.
- */
- public int getServicesCount() {
- return services_.size();
- }
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @param index The index of the element to return.
- * @return The services at the given index.
- */
- public int getServices(int index) {
- return services_.getInt(index);
- }
- private int servicesMemoizedSerializedSize = -1;
public static final int SERVICES_NAMES_FIELD_NUMBER = 7;
- private com.google.protobuf.LazyStringList servicesNames_;
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @return A list containing the servicesNames.
- */
- public com.google.protobuf.ProtocolStringList
- getServicesNamesList() {
- return servicesNames_;
- }
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @return The count of servicesNames.
- */
- public int getServicesNamesCount() {
- return servicesNames_.size();
- }
+ private volatile java.lang.Object servicesNames_;
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the element to return.
- * @return The servicesNames at the given index.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The servicesNames.
*/
- public java.lang.String getServicesNames(int index) {
- return servicesNames_.get(index);
+ @java.lang.Override
+ public java.lang.String getServicesNames() {
+ java.lang.Object ref = servicesNames_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ servicesNames_ = s;
+ return s;
+ }
}
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the value to return.
- * @return The bytes of the servicesNames at the given index.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The bytes for servicesNames.
*/
+ @java.lang.Override
public com.google.protobuf.ByteString
- getServicesNamesBytes(int index) {
- return servicesNames_.getByteString(index);
+ getServicesNamesBytes() {
+ java.lang.Object ref = servicesNames_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ servicesNames_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
}
public static final int LOCAL_ADDRS_FIELD_NUMBER = 8;
@@ -4478,7 +4407,6 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- getSerializedSize();
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(moniker_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, moniker_);
}
@@ -4494,15 +4422,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reachability_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 5, reachability_);
}
- if (getServicesList().size() > 0) {
- output.writeUInt32NoTag(50);
- output.writeUInt32NoTag(servicesMemoizedSerializedSize);
- }
- for (int i = 0; i < services_.size(); i++) {
- output.writeInt32NoTag(services_.getInt(i));
+ if (services_ != 0) {
+ output.writeInt32(6, services_);
}
- for (int i = 0; i < servicesNames_.size(); i++) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 7, servicesNames_.getRaw(i));
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(servicesNames_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, servicesNames_);
}
for (int i = 0; i < localAddrs_.size(); i++) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, localAddrs_.getRaw(i));
@@ -4541,27 +4465,12 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reachability_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, reachability_);
}
- {
- int dataSize = 0;
- for (int i = 0; i < services_.size(); i++) {
- dataSize += com.google.protobuf.CodedOutputStream
- .computeInt32SizeNoTag(services_.getInt(i));
- }
- size += dataSize;
- if (!getServicesList().isEmpty()) {
- size += 1;
- size += com.google.protobuf.CodedOutputStream
- .computeInt32SizeNoTag(dataSize);
- }
- servicesMemoizedSerializedSize = dataSize;
+ if (services_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(6, services_);
}
- {
- int dataSize = 0;
- for (int i = 0; i < servicesNames_.size(); i++) {
- dataSize += computeStringSizeNoTag(servicesNames_.getRaw(i));
- }
- size += dataSize;
- size += 1 * getServicesNamesList().size();
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(servicesNames_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, servicesNames_);
}
{
int dataSize = 0;
@@ -4612,10 +4521,10 @@ public boolean equals(final java.lang.Object obj) {
!= other.getStartedAt()) return false;
if (!getReachability()
.equals(other.getReachability())) return false;
- if (!getServicesList()
- .equals(other.getServicesList())) return false;
- if (!getServicesNamesList()
- .equals(other.getServicesNamesList())) return false;
+ if (getServices()
+ != other.getServices()) return false;
+ if (!getServicesNames()
+ .equals(other.getServicesNames())) return false;
if (!getLocalAddrsList()
.equals(other.getLocalAddrsList())) return false;
if (!getProtocolsList()
@@ -4650,14 +4559,10 @@ public int hashCode() {
getStartedAt());
hash = (37 * hash) + REACHABILITY_FIELD_NUMBER;
hash = (53 * hash) + getReachability().hashCode();
- if (getServicesCount() > 0) {
- hash = (37 * hash) + SERVICES_FIELD_NUMBER;
- hash = (53 * hash) + getServicesList().hashCode();
- }
- if (getServicesNamesCount() > 0) {
- hash = (37 * hash) + SERVICES_NAMES_FIELD_NUMBER;
- hash = (53 * hash) + getServicesNamesList().hashCode();
- }
+ hash = (37 * hash) + SERVICES_FIELD_NUMBER;
+ hash = (53 * hash) + getServices();
+ hash = (37 * hash) + SERVICES_NAMES_FIELD_NUMBER;
+ hash = (53 * hash) + getServicesNames().hashCode();
if (getLocalAddrsCount() > 0) {
hash = (37 * hash) + LOCAL_ADDRS_FIELD_NUMBER;
hash = (53 * hash) + getLocalAddrsList().hashCode();
@@ -4815,14 +4720,14 @@ public Builder clear() {
reachability_ = "";
- services_ = emptyIntList();
- bitField0_ = (bitField0_ & ~0x00000001);
- servicesNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000002);
+ services_ = 0;
+
+ servicesNames_ = "";
+
localAddrs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000001);
protocols_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000002);
clockOffset_ = 0D;
if (connectionInfoBuilder_ == null) {
@@ -4863,24 +4768,16 @@ public pactus.network.NetworkOuterClass.GetNodeInfoResponse buildPartial() {
result.peerId_ = peerId_;
result.startedAt_ = startedAt_;
result.reachability_ = reachability_;
- if (((bitField0_ & 0x00000001) != 0)) {
- services_.makeImmutable();
- bitField0_ = (bitField0_ & ~0x00000001);
- }
result.services_ = services_;
- if (((bitField0_ & 0x00000002) != 0)) {
- servicesNames_ = servicesNames_.getUnmodifiableView();
- bitField0_ = (bitField0_ & ~0x00000002);
- }
result.servicesNames_ = servicesNames_;
- if (((bitField0_ & 0x00000004) != 0)) {
+ if (((bitField0_ & 0x00000001) != 0)) {
localAddrs_ = localAddrs_.getUnmodifiableView();
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000001);
}
result.localAddrs_ = localAddrs_;
- if (((bitField0_ & 0x00000008) != 0)) {
+ if (((bitField0_ & 0x00000002) != 0)) {
protocols_ = protocols_.getUnmodifiableView();
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000002);
}
result.protocols_ = protocols_;
result.clockOffset_ = clockOffset_;
@@ -4956,30 +4853,17 @@ public Builder mergeFrom(pactus.network.NetworkOuterClass.GetNodeInfoResponse ot
reachability_ = other.reachability_;
onChanged();
}
- if (!other.services_.isEmpty()) {
- if (services_.isEmpty()) {
- services_ = other.services_;
- bitField0_ = (bitField0_ & ~0x00000001);
- } else {
- ensureServicesIsMutable();
- services_.addAll(other.services_);
- }
- onChanged();
+ if (other.getServices() != 0) {
+ setServices(other.getServices());
}
- if (!other.servicesNames_.isEmpty()) {
- if (servicesNames_.isEmpty()) {
- servicesNames_ = other.servicesNames_;
- bitField0_ = (bitField0_ & ~0x00000002);
- } else {
- ensureServicesNamesIsMutable();
- servicesNames_.addAll(other.servicesNames_);
- }
+ if (!other.getServicesNames().isEmpty()) {
+ servicesNames_ = other.servicesNames_;
onChanged();
}
if (!other.localAddrs_.isEmpty()) {
if (localAddrs_.isEmpty()) {
localAddrs_ = other.localAddrs_;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000001);
} else {
ensureLocalAddrsIsMutable();
localAddrs_.addAll(other.localAddrs_);
@@ -4989,7 +4873,7 @@ public Builder mergeFrom(pactus.network.NetworkOuterClass.GetNodeInfoResponse ot
if (!other.protocols_.isEmpty()) {
if (protocols_.isEmpty()) {
protocols_ = other.protocols_;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000002);
} else {
ensureProtocolsIsMutable();
protocols_.addAll(other.protocols_);
@@ -5054,25 +4938,13 @@ public Builder mergeFrom(
break;
} // case 42
case 48: {
- int v = input.readInt32();
- ensureServicesIsMutable();
- services_.addInt(v);
+ services_ = input.readInt32();
+
break;
} // case 48
- case 50: {
- int length = input.readRawVarint32();
- int limit = input.pushLimit(length);
- ensureServicesIsMutable();
- while (input.getBytesUntilLimit() > 0) {
- services_.addInt(input.readInt32());
- }
- input.popLimit(limit);
- break;
- } // case 50
case 58: {
- java.lang.String s = input.readStringRequireUtf8();
- ensureServicesNamesIsMutable();
- servicesNames_.add(s);
+ servicesNames_ = input.readStringRequireUtf8();
+
break;
} // case 58
case 66: {
@@ -5543,221 +5415,107 @@ public Builder setReachabilityBytes(
return this;
}
- private com.google.protobuf.Internal.IntList services_ = emptyIntList();
- private void ensureServicesIsMutable() {
- if (!((bitField0_ & 0x00000001) != 0)) {
- services_ = mutableCopy(services_);
- bitField0_ |= 0x00000001;
- }
- }
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @return A list containing the services.
- */
- public java.util.List
- getServicesList() {
- return ((bitField0_ & 0x00000001) != 0) ?
- java.util.Collections.unmodifiableList(services_) : services_;
- }
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @return The count of services.
- */
- public int getServicesCount() {
- return services_.size();
- }
+ private int services_ ;
/**
*
- * List of services provided by the node.
+ * A bitfield indicating the services provided by the node.
*
*
- * repeated int32 services = 6 [json_name = "services"];
- * @param index The index of the element to return.
- * @return The services at the given index.
+ * int32 services = 6 [json_name = "services"];
+ * @return The services.
*/
- public int getServices(int index) {
- return services_.getInt(index);
+ @java.lang.Override
+ public int getServices() {
+ return services_;
}
/**
*
- * List of services provided by the node.
+ * A bitfield indicating the services provided by the node.
*
*
- * repeated int32 services = 6 [json_name = "services"];
- * @param index The index to set the value at.
+ * int32 services = 6 [json_name = "services"];
* @param value The services to set.
* @return This builder for chaining.
*/
- public Builder setServices(
- int index, int value) {
- ensureServicesIsMutable();
- services_.setInt(index, value);
- onChanged();
- return this;
- }
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @param value The services to add.
- * @return This builder for chaining.
- */
- public Builder addServices(int value) {
- ensureServicesIsMutable();
- services_.addInt(value);
- onChanged();
- return this;
- }
- /**
- *
- * List of services provided by the node.
- *
- *
- * repeated int32 services = 6 [json_name = "services"];
- * @param values The services to add.
- * @return This builder for chaining.
- */
- public Builder addAllServices(
- java.lang.Iterable values) {
- ensureServicesIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, services_);
+ public Builder setServices(int value) {
+
+ services_ = value;
onChanged();
return this;
}
/**
*
- * List of services provided by the node.
+ * A bitfield indicating the services provided by the node.
*
*
- * repeated int32 services = 6 [json_name = "services"];
+ * int32 services = 6 [json_name = "services"];
* @return This builder for chaining.
*/
public Builder clearServices() {
- services_ = emptyIntList();
- bitField0_ = (bitField0_ & ~0x00000001);
+
+ services_ = 0;
onChanged();
return this;
}
- private com.google.protobuf.LazyStringList servicesNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- private void ensureServicesNamesIsMutable() {
- if (!((bitField0_ & 0x00000002) != 0)) {
- servicesNames_ = new com.google.protobuf.LazyStringArrayList(servicesNames_);
- bitField0_ |= 0x00000002;
- }
- }
+ private java.lang.Object servicesNames_ = "";
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @return A list containing the servicesNames.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The servicesNames.
*/
- public com.google.protobuf.ProtocolStringList
- getServicesNamesList() {
- return servicesNames_.getUnmodifiableView();
- }
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @return The count of servicesNames.
- */
- public int getServicesNamesCount() {
- return servicesNames_.size();
- }
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the element to return.
- * @return The servicesNames at the given index.
- */
- public java.lang.String getServicesNames(int index) {
- return servicesNames_.get(index);
+ public java.lang.String getServicesNames() {
+ java.lang.Object ref = servicesNames_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ servicesNames_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
}
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index of the value to return.
- * @return The bytes of the servicesNames at the given index.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @return The bytes for servicesNames.
*/
public com.google.protobuf.ByteString
- getServicesNamesBytes(int index) {
- return servicesNames_.getByteString(index);
+ getServicesNamesBytes() {
+ java.lang.Object ref = servicesNames_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ servicesNames_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
}
/**
*
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param index The index to set the value at.
+ * string services_names = 7 [json_name = "servicesNames"];
* @param value The servicesNames to set.
* @return This builder for chaining.
*/
public Builder setServicesNames(
- int index, java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureServicesNamesIsMutable();
- servicesNames_.set(index, value);
- onChanged();
- return this;
- }
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param value The servicesNames to add.
- * @return This builder for chaining.
- */
- public Builder addServicesNames(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
- ensureServicesNamesIsMutable();
- servicesNames_.add(value);
- onChanged();
- return this;
- }
- /**
- *
- * Names of services provided by the node.
- *
- *
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param values The servicesNames to add.
- * @return This builder for chaining.
- */
- public Builder addAllServicesNames(
- java.lang.Iterable values) {
- ensureServicesNamesIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, servicesNames_);
+
+ servicesNames_ = value;
onChanged();
return this;
}
@@ -5766,12 +5524,12 @@ public Builder addAllServicesNames(
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
+ * string services_names = 7 [json_name = "servicesNames"];
* @return This builder for chaining.
*/
public Builder clearServicesNames() {
- servicesNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000002);
+
+ servicesNames_ = getDefaultInstance().getServicesNames();
onChanged();
return this;
}
@@ -5780,27 +5538,27 @@ public Builder clearServicesNames() {
* Names of services provided by the node.
*
*
- * repeated string services_names = 7 [json_name = "servicesNames"];
- * @param value The bytes of the servicesNames to add.
+ * string services_names = 7 [json_name = "servicesNames"];
+ * @param value The bytes for servicesNames to set.
* @return This builder for chaining.
*/
- public Builder addServicesNamesBytes(
+ public Builder setServicesNamesBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
- ensureServicesNamesIsMutable();
- servicesNames_.add(value);
+
+ servicesNames_ = value;
onChanged();
return this;
}
private com.google.protobuf.LazyStringList localAddrs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureLocalAddrsIsMutable() {
- if (!((bitField0_ & 0x00000004) != 0)) {
+ if (!((bitField0_ & 0x00000001) != 0)) {
localAddrs_ = new com.google.protobuf.LazyStringArrayList(localAddrs_);
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
}
}
/**
@@ -5917,7 +5675,7 @@ public Builder addAllLocalAddrs(
*/
public Builder clearLocalAddrs() {
localAddrs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
@@ -5944,9 +5702,9 @@ public Builder addLocalAddrsBytes(
private com.google.protobuf.LazyStringList protocols_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureProtocolsIsMutable() {
- if (!((bitField0_ & 0x00000008) != 0)) {
+ if (!((bitField0_ & 0x00000002) != 0)) {
protocols_ = new com.google.protobuf.LazyStringArrayList(protocols_);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
}
}
/**
@@ -6063,7 +5821,7 @@ public Builder addAllProtocols(
*/
public Builder clearProtocols() {
protocols_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
return this;
}
@@ -10326,7 +10084,7 @@ public pactus.network.NetworkOuterClass.PeerInfo getDefaultInstanceForType() {
"nt\030\002 \001(\tR\005agent\022\027\n\007peer_id\030\003 \001(\tR\006peerId" +
"\022\035\n\nstarted_at\030\004 \001(\004R\tstartedAt\022\"\n\014reach" +
"ability\030\005 \001(\tR\014reachability\022\032\n\010services\030" +
- "\006 \003(\005R\010services\022%\n\016services_names\030\007 \003(\tR" +
+ "\006 \001(\005R\010services\022%\n\016services_names\030\007 \001(\tR" +
"\rservicesNames\022\037\n\013local_addrs\030\010 \003(\tR\nloc" +
"alAddrs\022\034\n\tprotocols\030\t \003(\tR\tprotocols\022!\n" +
"\014clock_offset\030\r \001(\001R\013clockOffset\022?\n\017conn" +
diff --git a/www/grpc/gen/js/network_pb.js b/www/grpc/gen/js/network_pb.js
index 54753c111..6e10b07af 100644
--- a/www/grpc/gen/js/network_pb.js
+++ b/www/grpc/gen/js/network_pb.js
@@ -928,7 +928,7 @@ proto.pactus.ConnectionInfo.prototype.setOutboundConnections = function(value) {
* @private {!Array}
* @const
*/
-proto.pactus.GetNodeInfoResponse.repeatedFields_ = [6,7,8,9];
+proto.pactus.GetNodeInfoResponse.repeatedFields_ = [8,9];
@@ -966,8 +966,8 @@ proto.pactus.GetNodeInfoResponse.toObject = function(includeInstance, msg) {
peerId: jspb.Message.getFieldWithDefault(msg, 3, ""),
startedAt: jspb.Message.getFieldWithDefault(msg, 4, 0),
reachability: jspb.Message.getFieldWithDefault(msg, 5, ""),
- servicesList: (f = jspb.Message.getRepeatedField(msg, 6)) == null ? undefined : f,
- servicesNamesList: (f = jspb.Message.getRepeatedField(msg, 7)) == null ? undefined : f,
+ services: jspb.Message.getFieldWithDefault(msg, 6, 0),
+ servicesNames: jspb.Message.getFieldWithDefault(msg, 7, ""),
localAddrsList: (f = jspb.Message.getRepeatedField(msg, 8)) == null ? undefined : f,
protocolsList: (f = jspb.Message.getRepeatedField(msg, 9)) == null ? undefined : f,
clockOffset: jspb.Message.getFloatingPointFieldWithDefault(msg, 13, 0.0),
@@ -1029,14 +1029,12 @@ proto.pactus.GetNodeInfoResponse.deserializeBinaryFromReader = function(msg, rea
msg.setReachability(value);
break;
case 6:
- var values = /** @type {!Array} */ (reader.isDelimited() ? reader.readPackedInt32() : [reader.readInt32()]);
- for (var i = 0; i < values.length; i++) {
- msg.addServices(values[i]);
- }
+ var value = /** @type {number} */ (reader.readInt32());
+ msg.setServices(value);
break;
case 7:
var value = /** @type {string} */ (reader.readString());
- msg.addServicesNames(value);
+ msg.setServicesNames(value);
break;
case 8:
var value = /** @type {string} */ (reader.readString());
@@ -1119,16 +1117,16 @@ proto.pactus.GetNodeInfoResponse.serializeBinaryToWriter = function(message, wri
f
);
}
- f = message.getServicesList();
- if (f.length > 0) {
- writer.writePackedInt32(
+ f = message.getServices();
+ if (f !== 0) {
+ writer.writeInt32(
6,
f
);
}
- f = message.getServicesNamesList();
+ f = message.getServicesNames();
if (f.length > 0) {
- writer.writeRepeatedString(
+ writer.writeString(
7,
f
);
@@ -1256,76 +1254,38 @@ proto.pactus.GetNodeInfoResponse.prototype.setReachability = function(value) {
/**
- * repeated int32 services = 6;
- * @return {!Array}
- */
-proto.pactus.GetNodeInfoResponse.prototype.getServicesList = function() {
- return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 6));
-};
-
-
-/**
- * @param {!Array} value
- * @return {!proto.pactus.GetNodeInfoResponse} returns this
+ * optional int32 services = 6;
+ * @return {number}
*/
-proto.pactus.GetNodeInfoResponse.prototype.setServicesList = function(value) {
- return jspb.Message.setField(this, 6, value || []);
+proto.pactus.GetNodeInfoResponse.prototype.getServices = function() {
+ return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
};
/**
* @param {number} value
- * @param {number=} opt_index
- * @return {!proto.pactus.GetNodeInfoResponse} returns this
- */
-proto.pactus.GetNodeInfoResponse.prototype.addServices = function(value, opt_index) {
- return jspb.Message.addToRepeatedField(this, 6, value, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
* @return {!proto.pactus.GetNodeInfoResponse} returns this
*/
-proto.pactus.GetNodeInfoResponse.prototype.clearServicesList = function() {
- return this.setServicesList([]);
+proto.pactus.GetNodeInfoResponse.prototype.setServices = function(value) {
+ return jspb.Message.setProto3IntField(this, 6, value);
};
/**
- * repeated string services_names = 7;
- * @return {!Array}
- */
-proto.pactus.GetNodeInfoResponse.prototype.getServicesNamesList = function() {
- return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 7));
-};
-
-
-/**
- * @param {!Array} value
- * @return {!proto.pactus.GetNodeInfoResponse} returns this
+ * optional string services_names = 7;
+ * @return {string}
*/
-proto.pactus.GetNodeInfoResponse.prototype.setServicesNamesList = function(value) {
- return jspb.Message.setField(this, 7, value || []);
+proto.pactus.GetNodeInfoResponse.prototype.getServicesNames = function() {
+ return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
};
/**
* @param {string} value
- * @param {number=} opt_index
- * @return {!proto.pactus.GetNodeInfoResponse} returns this
- */
-proto.pactus.GetNodeInfoResponse.prototype.addServicesNames = function(value, opt_index) {
- return jspb.Message.addToRepeatedField(this, 7, value, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
* @return {!proto.pactus.GetNodeInfoResponse} returns this
*/
-proto.pactus.GetNodeInfoResponse.prototype.clearServicesNamesList = function() {
- return this.setServicesNamesList([]);
+proto.pactus.GetNodeInfoResponse.prototype.setServicesNames = function(value) {
+ return jspb.Message.setProto3StringField(this, 7, value);
};
diff --git a/www/grpc/gen/python/network_pb2.py b/www/grpc/gen/python/network_pb2.py
index 1112bd426..c5b3553e0 100644
--- a/www/grpc/gen/python/network_pb2.py
+++ b/www/grpc/gen/python/network_pb2.py
@@ -13,7 +13,7 @@
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rnetwork.proto\x12\x06pactus\">\n\x15GetNetworkInfoRequest\x12%\n\x0eonly_connected\x18\x01 \x01(\x08R\ronlyConnected\"\xae\x04\n\x16GetNetworkInfoResponse\x12!\n\x0cnetwork_name\x18\x01 \x01(\tR\x0bnetworkName\x12(\n\x10total_sent_bytes\x18\x02 \x01(\x03R\x0etotalSentBytes\x12\x30\n\x14total_received_bytes\x18\x03 \x01(\x03R\x12totalReceivedBytes\x12\x32\n\x15\x63onnected_peers_count\x18\x04 \x01(\rR\x13\x63onnectedPeersCount\x12\x39\n\x0f\x63onnected_peers\x18\x05 \x03(\x0b\x32\x10.pactus.PeerInfoR\x0e\x63onnectedPeers\x12L\n\nsent_bytes\x18\x06 \x03(\x0b\x32-.pactus.GetNetworkInfoResponse.SentBytesEntryR\tsentBytes\x12X\n\x0ereceived_bytes\x18\x07 \x03(\x0b\x32\x31.pactus.GetNetworkInfoResponse.ReceivedBytesEntryR\rreceivedBytes\x1a<\n\x0eSentBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x1a@\n\x12ReceivedBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\"\x14\n\x12GetNodeInfoRequest\"\x96\x01\n\x0e\x43onnectionInfo\x12 \n\x0b\x63onnections\x18\x01 \x01(\x04R\x0b\x63onnections\x12/\n\x13inbound_connections\x18\x02 \x01(\x04R\x12inboundConnections\x12\x31\n\x14outbound_connections\x18\x03 \x01(\x04R\x13outboundConnections\"\x87\x03\n\x13GetNodeInfoResponse\x12\x18\n\x07moniker\x18\x01 \x01(\tR\x07moniker\x12\x14\n\x05\x61gent\x18\x02 \x01(\tR\x05\x61gent\x12\x17\n\x07peer_id\x18\x03 \x01(\tR\x06peerId\x12\x1d\n\nstarted_at\x18\x04 \x01(\x04R\tstartedAt\x12\"\n\x0creachability\x18\x05 \x01(\tR\x0creachability\x12\x1a\n\x08services\x18\x06 \x03(\x05R\x08services\x12%\n\x0eservices_names\x18\x07 \x03(\tR\rservicesNames\x12\x1f\n\x0blocal_addrs\x18\x08 \x03(\tR\nlocalAddrs\x12\x1c\n\tprotocols\x18\t \x03(\tR\tprotocols\x12!\n\x0c\x63lock_offset\x18\r \x01(\x01R\x0b\x63lockOffset\x12?\n\x0f\x63onnection_info\x18\x0e \x01(\x0b\x32\x16.pactus.ConnectionInfoR\x0e\x63onnectionInfo\"\xed\x06\n\x08PeerInfo\x12\x16\n\x06status\x18\x01 \x01(\x05R\x06status\x12\x18\n\x07moniker\x18\x02 \x01(\tR\x07moniker\x12\x14\n\x05\x61gent\x18\x03 \x01(\tR\x05\x61gent\x12\x17\n\x07peer_id\x18\x04 \x01(\tR\x06peerId\x12%\n\x0e\x63onsensus_keys\x18\x05 \x03(\tR\rconsensusKeys\x12/\n\x13\x63onsensus_addresses\x18\x06 \x03(\tR\x12\x63onsensusAddresses\x12\x1a\n\x08services\x18\x07 \x01(\rR\x08services\x12&\n\x0flast_block_hash\x18\x08 \x01(\tR\rlastBlockHash\x12\x16\n\x06height\x18\t \x01(\rR\x06height\x12)\n\x10received_bundles\x18\n \x01(\x05R\x0freceivedBundles\x12\'\n\x0finvalid_bundles\x18\x0b \x01(\x05R\x0einvalidBundles\x12\x1b\n\tlast_sent\x18\x0c \x01(\x03R\x08lastSent\x12#\n\rlast_received\x18\r \x01(\x03R\x0clastReceived\x12>\n\nsent_bytes\x18\x0e \x03(\x0b\x32\x1f.pactus.PeerInfo.SentBytesEntryR\tsentBytes\x12J\n\x0ereceived_bytes\x18\x0f \x03(\x0b\x32#.pactus.PeerInfo.ReceivedBytesEntryR\rreceivedBytes\x12\x18\n\x07\x61\x64\x64ress\x18\x10 \x01(\tR\x07\x61\x64\x64ress\x12\x1c\n\tdirection\x18\x11 \x01(\tR\tdirection\x12\x1c\n\tprotocols\x18\x12 \x03(\tR\tprotocols\x12%\n\x0etotal_sessions\x18\x13 \x01(\x05R\rtotalSessions\x12-\n\x12\x63ompleted_sessions\x18\x14 \x01(\x05R\x11\x63ompletedSessions\x1a<\n\x0eSentBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x1a@\n\x12ReceivedBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x32\xa2\x01\n\x07Network\x12O\n\x0eGetNetworkInfo\x12\x1d.pactus.GetNetworkInfoRequest\x1a\x1e.pactus.GetNetworkInfoResponse\x12\x46\n\x0bGetNodeInfo\x12\x1a.pactus.GetNodeInfoRequest\x1a\x1b.pactus.GetNodeInfoResponseBB\n\x0epactus.networkZ0github.com/pactus-project/pactus/www/grpc/pactusb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rnetwork.proto\x12\x06pactus\">\n\x15GetNetworkInfoRequest\x12%\n\x0eonly_connected\x18\x01 \x01(\x08R\ronlyConnected\"\xae\x04\n\x16GetNetworkInfoResponse\x12!\n\x0cnetwork_name\x18\x01 \x01(\tR\x0bnetworkName\x12(\n\x10total_sent_bytes\x18\x02 \x01(\x03R\x0etotalSentBytes\x12\x30\n\x14total_received_bytes\x18\x03 \x01(\x03R\x12totalReceivedBytes\x12\x32\n\x15\x63onnected_peers_count\x18\x04 \x01(\rR\x13\x63onnectedPeersCount\x12\x39\n\x0f\x63onnected_peers\x18\x05 \x03(\x0b\x32\x10.pactus.PeerInfoR\x0e\x63onnectedPeers\x12L\n\nsent_bytes\x18\x06 \x03(\x0b\x32-.pactus.GetNetworkInfoResponse.SentBytesEntryR\tsentBytes\x12X\n\x0ereceived_bytes\x18\x07 \x03(\x0b\x32\x31.pactus.GetNetworkInfoResponse.ReceivedBytesEntryR\rreceivedBytes\x1a<\n\x0eSentBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x1a@\n\x12ReceivedBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\"\x14\n\x12GetNodeInfoRequest\"\x96\x01\n\x0e\x43onnectionInfo\x12 \n\x0b\x63onnections\x18\x01 \x01(\x04R\x0b\x63onnections\x12/\n\x13inbound_connections\x18\x02 \x01(\x04R\x12inboundConnections\x12\x31\n\x14outbound_connections\x18\x03 \x01(\x04R\x13outboundConnections\"\x87\x03\n\x13GetNodeInfoResponse\x12\x18\n\x07moniker\x18\x01 \x01(\tR\x07moniker\x12\x14\n\x05\x61gent\x18\x02 \x01(\tR\x05\x61gent\x12\x17\n\x07peer_id\x18\x03 \x01(\tR\x06peerId\x12\x1d\n\nstarted_at\x18\x04 \x01(\x04R\tstartedAt\x12\"\n\x0creachability\x18\x05 \x01(\tR\x0creachability\x12\x1a\n\x08services\x18\x06 \x01(\x05R\x08services\x12%\n\x0eservices_names\x18\x07 \x01(\tR\rservicesNames\x12\x1f\n\x0blocal_addrs\x18\x08 \x03(\tR\nlocalAddrs\x12\x1c\n\tprotocols\x18\t \x03(\tR\tprotocols\x12!\n\x0c\x63lock_offset\x18\r \x01(\x01R\x0b\x63lockOffset\x12?\n\x0f\x63onnection_info\x18\x0e \x01(\x0b\x32\x16.pactus.ConnectionInfoR\x0e\x63onnectionInfo\"\xed\x06\n\x08PeerInfo\x12\x16\n\x06status\x18\x01 \x01(\x05R\x06status\x12\x18\n\x07moniker\x18\x02 \x01(\tR\x07moniker\x12\x14\n\x05\x61gent\x18\x03 \x01(\tR\x05\x61gent\x12\x17\n\x07peer_id\x18\x04 \x01(\tR\x06peerId\x12%\n\x0e\x63onsensus_keys\x18\x05 \x03(\tR\rconsensusKeys\x12/\n\x13\x63onsensus_addresses\x18\x06 \x03(\tR\x12\x63onsensusAddresses\x12\x1a\n\x08services\x18\x07 \x01(\rR\x08services\x12&\n\x0flast_block_hash\x18\x08 \x01(\tR\rlastBlockHash\x12\x16\n\x06height\x18\t \x01(\rR\x06height\x12)\n\x10received_bundles\x18\n \x01(\x05R\x0freceivedBundles\x12\'\n\x0finvalid_bundles\x18\x0b \x01(\x05R\x0einvalidBundles\x12\x1b\n\tlast_sent\x18\x0c \x01(\x03R\x08lastSent\x12#\n\rlast_received\x18\r \x01(\x03R\x0clastReceived\x12>\n\nsent_bytes\x18\x0e \x03(\x0b\x32\x1f.pactus.PeerInfo.SentBytesEntryR\tsentBytes\x12J\n\x0ereceived_bytes\x18\x0f \x03(\x0b\x32#.pactus.PeerInfo.ReceivedBytesEntryR\rreceivedBytes\x12\x18\n\x07\x61\x64\x64ress\x18\x10 \x01(\tR\x07\x61\x64\x64ress\x12\x1c\n\tdirection\x18\x11 \x01(\tR\tdirection\x12\x1c\n\tprotocols\x18\x12 \x03(\tR\tprotocols\x12%\n\x0etotal_sessions\x18\x13 \x01(\x05R\rtotalSessions\x12-\n\x12\x63ompleted_sessions\x18\x14 \x01(\x05R\x11\x63ompletedSessions\x1a<\n\x0eSentBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x1a@\n\x12ReceivedBytesEntry\x12\x10\n\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n\x05value\x18\x02 \x01(\x03R\x05value:\x02\x38\x01\x32\xa2\x01\n\x07Network\x12O\n\x0eGetNetworkInfo\x12\x1d.pactus.GetNetworkInfoRequest\x1a\x1e.pactus.GetNetworkInfoResponse\x12\x46\n\x0bGetNodeInfo\x12\x1a.pactus.GetNodeInfoRequest\x1a\x1b.pactus.GetNodeInfoResponseBB\n\x0epactus.networkZ0github.com/pactus-project/pactus/www/grpc/pactusb\x06proto3')
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'network_pb2', globals())
diff --git a/www/grpc/gen/rust/pactus.rs b/www/grpc/gen/rust/pactus.rs
index 8bbe8bd42..45669cf95 100644
--- a/www/grpc/gen/rust/pactus.rs
+++ b/www/grpc/gen/rust/pactus.rs
@@ -839,12 +839,12 @@ pub struct GetNodeInfoResponse {
/// Reachability status of the node.
#[prost(string, tag="5")]
pub reachability: ::prost::alloc::string::String,
- /// List of services provided by the node.
- #[prost(int32, repeated, tag="6")]
- pub services: ::prost::alloc::vec::Vec,
+ /// A bitfield indicating the services provided by the node.
+ #[prost(int32, tag="6")]
+ pub services: i32,
/// Names of services provided by the node.
- #[prost(string, repeated, tag="7")]
- pub services_names: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+ #[prost(string, tag="7")]
+ pub services_names: ::prost::alloc::string::String,
/// List of addresses associated with the node.
#[prost(string, repeated, tag="8")]
pub local_addrs: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
diff --git a/www/grpc/gen/rust/pactus.serde.rs b/www/grpc/gen/rust/pactus.serde.rs
index 7cd19d589..04d1eaf0b 100644
--- a/www/grpc/gen/rust/pactus.serde.rs
+++ b/www/grpc/gen/rust/pactus.serde.rs
@@ -3857,7 +3857,7 @@ impl serde::Serialize for GetNodeInfoResponse {
if !self.reachability.is_empty() {
len += 1;
}
- if !self.services.is_empty() {
+ if self.services != 0 {
len += 1;
}
if !self.services_names.is_empty() {
@@ -3891,7 +3891,7 @@ impl serde::Serialize for GetNodeInfoResponse {
if !self.reachability.is_empty() {
struct_ser.serialize_field("reachability", &self.reachability)?;
}
- if !self.services.is_empty() {
+ if self.services != 0 {
struct_ser.serialize_field("services", &self.services)?;
}
if !self.services_names.is_empty() {
@@ -4052,8 +4052,7 @@ impl<'de> serde::Deserialize<'de> for GetNodeInfoResponse {
return Err(serde::de::Error::duplicate_field("services"));
}
services__ =
- Some(map.next_value::>>()?
- .into_iter().map(|x| x.0).collect())
+ Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
;
}
GeneratedField::ServicesNames => {
diff --git a/www/grpc/network.go b/www/grpc/network.go
index 078c66600..ce2bd75a8 100644
--- a/www/grpc/network.go
+++ b/www/grpc/network.go
@@ -6,7 +6,6 @@ import (
"github.com/fxamacker/cbor/v2"
"github.com/pactus-project/pactus/sync/peerset/peer"
- "github.com/pactus-project/pactus/sync/peerset/peer/service"
"github.com/pactus-project/pactus/version"
pactus "github.com/pactus-project/pactus/www/grpc/gen/go"
)
@@ -26,14 +25,6 @@ func (s *networkServer) GetNodeInfo(_ context.Context,
) (*pactus.GetNodeInfoResponse, error) {
ps := s.sync.PeerSet()
- services := []int32{}
- servicesNames := []string{}
-
- if s.sync.Services().IsNetwork() {
- services = append(services, int32(service.Network))
- servicesNames = append(servicesNames, "NETWORK")
- }
-
clockOffset, err := s.sync.ClockOffset()
if err != nil {
s.logger.Warn("failed to get clock offset", "err", err)
@@ -47,8 +38,8 @@ func (s *networkServer) GetNodeInfo(_ context.Context,
LocalAddrs: s.net.HostAddrs(),
StartedAt: uint64(ps.StartedAt().Unix()),
Protocols: s.net.Protocols(),
- Services: services,
- ServicesNames: servicesNames,
+ Services: int32(s.sync.Services()),
+ ServicesNames: s.sync.Services().String(),
ClockOffset: clockOffset.Seconds(),
ConnectionInfo: &pactus.ConnectionInfo{
Connections: uint64(s.net.NumConnectedPeers()),
diff --git a/www/grpc/proto/network.proto b/www/grpc/proto/network.proto
index 39461493b..58387db86 100644
--- a/www/grpc/proto/network.proto
+++ b/www/grpc/proto/network.proto
@@ -63,10 +63,10 @@ message GetNodeInfoResponse {
uint64 started_at = 4;
// Reachability status of the node.
string reachability = 5;
- // List of services provided by the node.
- repeated int32 services = 6;
+ // A bitfield indicating the services provided by the node.
+ int32 services = 6;
// Names of services provided by the node.
- repeated string services_names = 7;
+ string services_names = 7;
// List of addresses associated with the node.
repeated string local_addrs = 8;
// List of protocols supported by the node.
diff --git a/www/grpc/swagger-ui/pactus.swagger.json b/www/grpc/swagger-ui/pactus.swagger.json
index ccf851722..b36f293e7 100644
--- a/www/grpc/swagger-ui/pactus.swagger.json
+++ b/www/grpc/swagger-ui/pactus.swagger.json
@@ -1721,18 +1721,12 @@
"description": "Reachability status of the node."
},
"services": {
- "type": "array",
- "items": {
- "type": "integer",
- "format": "int32"
- },
- "description": "List of services provided by the node."
+ "type": "integer",
+ "format": "int32",
+ "description": "A bitfield indicating the services provided by the node."
},
"servicesNames": {
- "type": "array",
- "items": {
- "type": "string"
- },
+ "type": "string",
"description": "Names of services provided by the node."
},
"localAddrs": {
diff --git a/www/http/network.go b/www/http/network.go
index 48e9d3faf..713f7aa0f 100644
--- a/www/http/network.go
+++ b/www/http/network.go
@@ -123,13 +123,13 @@ func (s *Server) NodeHandler(w http.ResponseWriter, r *http.Request) {
tm.addRowTime("Started at", int64(res.StartedAt))
tm.addRowString("Reachability", res.Reachability)
tm.addRowFloat64("Clock Offset", res.ClockOffset)
- tm.addRowInts("Services", res.Services)
- tm.addRowStrings("Services Names", res.ServicesNames)
+ tm.addRowInt("Services", int(res.Services))
+ tm.addRowString("Services Names", res.ServicesNames)
tm.addRowString("Connection Info", "---")
- tm.addRowInt(" Total connections", int(res.ConnectionInfo.Connections))
- tm.addRowInt(" Inbound connections", int(res.ConnectionInfo.InboundConnections))
- tm.addRowInt(" Outbound connections", int(res.ConnectionInfo.OutboundConnections))
+ tm.addRowInt("-- Total connections", int(res.ConnectionInfo.Connections))
+ tm.addRowInt("-- Inbound connections", int(res.ConnectionInfo.InboundConnections))
+ tm.addRowInt("-- Outbound connections", int(res.ConnectionInfo.OutboundConnections))
tm.addRowString("Protocols", "---")
for i, p := range res.Protocols {
diff --git a/www/http/server.go b/www/http/server.go
index b5f0c3745..0a451a168 100644
--- a/www/http/server.go
+++ b/www/http/server.go
@@ -117,7 +117,6 @@ func (s *Server) StartServer(grpcServer string) error {
s.logger.Error("error on a connection", "error", err)
}
}
- s.logger.Info("http server started", "addr", listener.Addr())
}
}()