Add missing GoGoProtos types. Though I'm not really sure what I'm doing here - had to manually adjust the import in Types

Also, add custom CodeType type as it was removed in 0.13.
This commit is contained in:
srmo 2017-12-10 18:51:11 +01:00
parent 68eb051982
commit 42942990d6
7 changed files with 1058 additions and 7 deletions

View File

@ -32,6 +32,7 @@ import com.github.jtendermint.jabci.api.ICommit;
import com.github.jtendermint.jabci.api.IDeliverTx; import com.github.jtendermint.jabci.api.IDeliverTx;
import com.github.jtendermint.jabci.api.IQuery; import com.github.jtendermint.jabci.api.IQuery;
import com.github.jtendermint.jabci.socket.TSocket; import com.github.jtendermint.jabci.socket.TSocket;
import com.github.jtendermint.jabci.types.CodeType;
import com.github.jtendermint.jabci.types.Types.RequestCheckTx; import com.github.jtendermint.jabci.types.Types.RequestCheckTx;
import com.github.jtendermint.jabci.types.Types.RequestCommit; import com.github.jtendermint.jabci.types.Types.RequestCommit;
import com.github.jtendermint.jabci.types.Types.RequestDeliverTx; import com.github.jtendermint.jabci.types.Types.RequestDeliverTx;

View File

@ -23,11 +23,11 @@
*/ */
package com.github.jtendermint.jabci.socket; package com.github.jtendermint.jabci.socket;
import com.github.jtendermint.jabci.types.CodeType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.github.jtendermint.jabci.api.ABCIAPI; import com.github.jtendermint.jabci.api.ABCIAPI;
import com.github.jtendermint.jabci.types.Types.CodeType;
import com.github.jtendermint.jabci.types.Types.RequestBeginBlock; import com.github.jtendermint.jabci.types.Types.RequestBeginBlock;
import com.github.jtendermint.jabci.types.Types.RequestCheckTx; import com.github.jtendermint.jabci.types.Types.RequestCheckTx;
import com.github.jtendermint.jabci.types.Types.RequestCommit; import com.github.jtendermint.jabci.types.Types.RequestCommit;

View File

@ -0,0 +1,7 @@
package com.github.jtendermint.jabci.types;
public class CodeType {
public static final int OK = 0;
public static final int BadNonce = 1;
}

View File

@ -3,7 +3,8 @@
package com.github.jtendermint.jabci.types; package com.github.jtendermint.jabci.types;
@SuppressWarnings("ALL") import google.protobuf.GoGoProtos;
public final class Types { public final class Types {
private Types() {} private Types() {}
public static void registerAllExtensions( public static void registerAllExtensions(
@ -23711,7 +23712,7 @@ public final class Types {
com.google.protobuf.Descriptors.FileDescriptor com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] { new com.google.protobuf.Descriptors.FileDescriptor[] {
com.google.protobuf.GoGoProtos.getDescriptor(), GoGoProtos.getDescriptor(),
}, assigner); }, assigner);
internal_static_com_github_jtendermint_jabci_types_Request_descriptor = internal_static_com_github_jtendermint_jabci_types_Request_descriptor =
getDescriptor().getMessageTypes().get(0); getDescriptor().getMessageTypes().get(0);
@ -23901,11 +23902,11 @@ public final class Types {
new java.lang.String[] { "Key", "ValueType", "ValueString", "ValueInt", }); new java.lang.String[] { "Key", "ValueType", "ValueString", "ValueInt", });
com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry registry =
com.google.protobuf.ExtensionRegistry.newInstance(); com.google.protobuf.ExtensionRegistry.newInstance();
registry.add(com.google.protobuf.GoGoProtos.customtype); registry.add(GoGoProtos.customtype);
registry.add(com.google.protobuf.GoGoProtos.nullable); registry.add(GoGoProtos.nullable);
com.google.protobuf.Descriptors.FileDescriptor com.google.protobuf.Descriptors.FileDescriptor
.internalUpdateFileDescriptor(descriptor, registry); .internalUpdateFileDescriptor(descriptor, registry);
com.google.protobuf.GoGoProtos.getDescriptor(); GoGoProtos.getDescriptor();
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)

File diff suppressed because it is too large Load Diff

View File

@ -27,12 +27,12 @@ import static org.junit.Assert.*;
import java.io.IOException; import java.io.IOException;
import com.github.jtendermint.jabci.types.CodeType;
import org.junit.Test; import org.junit.Test;
import com.github.jtendermint.jabci.api.ABCIAPI; import com.github.jtendermint.jabci.api.ABCIAPI;
import com.github.jtendermint.jabci.api.ICheckTx; import com.github.jtendermint.jabci.api.ICheckTx;
import com.github.jtendermint.jabci.api.IInfo; import com.github.jtendermint.jabci.api.IInfo;
import com.github.jtendermint.jabci.types.Types.CodeType;
import com.github.jtendermint.jabci.types.Types.Request; import com.github.jtendermint.jabci.types.Types.Request;
import com.github.jtendermint.jabci.types.Types.RequestBeginBlock; import com.github.jtendermint.jabci.types.Types.RequestBeginBlock;
import com.github.jtendermint.jabci.types.Types.RequestCheckTx; import com.github.jtendermint.jabci.types.Types.RequestCheckTx;