From dfaa50885c0bf9bb123c76d050cb93cf3c98c993 Mon Sep 17 00:00:00 2001 From: Ich Date: Fri, 30 Jun 2017 11:51:29 +0200 Subject: [PATCH] updating dependencies and tm compatibility with 0.10 --- pom.xml | 4 +- .../github/jtendermint/jabci/JavaCounter.java | 3 +- .../github/jtendermint/jabci/types/Types.java | 485 +++++------------- src/main/proto/types.proto | 26 +- 4 files changed, 143 insertions(+), 375 deletions(-) diff --git a/pom.xml b/pom.xml index 094adef..ea8d78b 100644 --- a/pom.xml +++ b/pom.xml @@ -136,12 +136,12 @@ com.google.protobuf protobuf-java - 3.1.0 + 3.3.0 org.slf4j slf4j-simple - 1.7.21 + 1.7.25 junit diff --git a/src/main/java/com/github/jtendermint/jabci/JavaCounter.java b/src/main/java/com/github/jtendermint/jabci/JavaCounter.java index 3764c0d..44855ea 100644 --- a/src/main/java/com/github/jtendermint/jabci/JavaCounter.java +++ b/src/main/java/com/github/jtendermint/jabci/JavaCounter.java @@ -146,7 +146,8 @@ public final class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery return ResponseQuery.newBuilder().setCode(CodeType.OK) .setValue(ByteString.copyFrom(("" + hashCount).getBytes(Charset.forName("UTF-8")))).build(); case "tx": - return ResponseQuery.newBuilder().setCode(CodeType.OK).setValue(ByteString.copyFrom(("" + txCount).getBytes(Charset.forName("UTF-8")))).build(); + return ResponseQuery.newBuilder().setCode(CodeType.OK) + .setValue(ByteString.copyFrom(("" + txCount).getBytes(Charset.forName("UTF-8")))).build(); default: return ResponseQuery.newBuilder().setCode(CodeType.BadNonce).setLog("Invalid query path. Expected hash or tx, got " + query) .build(); diff --git a/src/main/java/com/github/jtendermint/jabci/types/Types.java b/src/main/java/com/github/jtendermint/jabci/types/Types.java index 2493957..dabf83e 100644 --- a/src/main/java/com/github/jtendermint/jabci/types/Types.java +++ b/src/main/java/com/github/jtendermint/jabci/types/Types.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: types.proto +// source: proto/types.proto package com.github.jtendermint.jabci.types; @@ -14,210 +14,6 @@ public final class Types { registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } - /** - * 
-   * Not being used
-   * Could be added to request/response
-   * so we don't have to type switch
-   * (would be twice as fast, but we're talking about 15ns)
-   *
- * - * Protobuf enum {@code com.github.jtendermint.jabci.types.MessageType} - */ - public enum MessageType - implements com.google.protobuf.ProtocolMessageEnum { - /** - * NullMessage = 0; - */ - NullMessage(0), - /** - * Echo = 1; - */ - Echo(1), - /** - * Flush = 2; - */ - Flush(2), - /** - * Info = 3; - */ - Info(3), - /** - * SetOption = 4; - */ - SetOption(4), - /** - * Exception = 5; - */ - Exception(5), - /** - * DeliverTx = 17; - */ - DeliverTx(17), - /** - * CheckTx = 18; - */ - CheckTx(18), - /** - * Commit = 19; - */ - Commit(19), - /** - * Query = 20; - */ - Query(20), - /** - * InitChain = 21; - */ - InitChain(21), - /** - * BeginBlock = 22; - */ - BeginBlock(22), - /** - * EndBlock = 23; - */ - EndBlock(23), - UNRECOGNIZED(-1), - ; - - /** - * NullMessage = 0; - */ - public static final int NullMessage_VALUE = 0; - /** - * Echo = 1; - */ - public static final int Echo_VALUE = 1; - /** - * Flush = 2; - */ - public static final int Flush_VALUE = 2; - /** - * Info = 3; - */ - public static final int Info_VALUE = 3; - /** - * SetOption = 4; - */ - public static final int SetOption_VALUE = 4; - /** - * Exception = 5; - */ - public static final int Exception_VALUE = 5; - /** - * DeliverTx = 17; - */ - public static final int DeliverTx_VALUE = 17; - /** - * CheckTx = 18; - */ - public static final int CheckTx_VALUE = 18; - /** - * Commit = 19; - */ - public static final int Commit_VALUE = 19; - /** - * Query = 20; - */ - public static final int Query_VALUE = 20; - /** - * InitChain = 21; - */ - public static final int InitChain_VALUE = 21; - /** - * BeginBlock = 22; - */ - public static final int BeginBlock_VALUE = 22; - /** - * EndBlock = 23; - */ - public static final int EndBlock_VALUE = 23; - - - public final int getNumber() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); - } - return value; - } - - /** - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static MessageType valueOf(int value) { - return forNumber(value); - } - - public static MessageType forNumber(int value) { - switch (value) { - case 0: return NullMessage; - case 1: return Echo; - case 2: return Flush; - case 3: return Info; - case 4: return SetOption; - case 5: return Exception; - case 17: return DeliverTx; - case 18: return CheckTx; - case 19: return Commit; - case 20: return Query; - case 21: return InitChain; - case 22: return BeginBlock; - case 23: return EndBlock; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static final com.google.protobuf.Internal.EnumLiteMap< - MessageType> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public MessageType findValueByNumber(int number) { - return MessageType.forNumber(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(ordinal()); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return com.github.jtendermint.jabci.types.Types.getDescriptor().getEnumTypes().get(0); - } - - private static final MessageType[] VALUES = values(); - - public static MessageType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - if (desc.getIndex() == -1) { - return UNRECOGNIZED; - } - return VALUES[desc.getIndex()]; - } - - private final int value; - - private MessageType(int value) { - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:com.github.jtendermint.jabci.types.MessageType) - } - /** * Protobuf enum {@code com.github.jtendermint.jabci.types.CodeType} */ @@ -566,7 +362,7 @@ public final class Types { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.github.jtendermint.jabci.types.Types.getDescriptor().getEnumTypes().get(1); + return com.github.jtendermint.jabci.types.Types.getDescriptor().getEnumTypes().get(0); } private static final CodeType[] VALUES = values(); @@ -21615,148 +21411,143 @@ public final class Types { descriptor; static { java.lang.String[] descriptorData = { - "\n\013types.proto\022\"com.github.jtendermint.ja" + - "bci.types\"\243\006\n\007Request\022?\n\004echo\030\001 \001(\0132/.co" + - "m.github.jtendermint.jabci.types.Request" + - "EchoH\000\022A\n\005flush\030\002 \001(\01320.com.github.jtend" + - "ermint.jabci.types.RequestFlushH\000\022?\n\004inf" + - "o\030\003 \001(\0132/.com.github.jtendermint.jabci.t" + - "ypes.RequestInfoH\000\022J\n\nset_option\030\004 \001(\01324" + + "\n\021proto/types.proto\022\"com.github.jtenderm" + + "int.jabci.types\"\243\006\n\007Request\022?\n\004echo\030\001 \001(" + + "\0132/.com.github.jtendermint.jabci.types.R" + + "equestEchoH\000\022A\n\005flush\030\002 \001(\01320.com.github" + + ".jtendermint.jabci.types.RequestFlushH\000\022" + + "?\n\004info\030\003 \001(\0132/.com.github.jtendermint.j" + + "abci.types.RequestInfoH\000\022J\n\nset_option\030\004" + + " \001(\01324.com.github.jtendermint.jabci.type" + + "s.RequestSetOptionH\000\022J\n\ndeliver_tx\030\005 \001(\013" + + "24.com.github.jtendermint.jabci.types.Re", + "questDeliverTxH\000\022F\n\010check_tx\030\006 \001(\01322.com" + + ".github.jtendermint.jabci.types.RequestC" + + "heckTxH\000\022C\n\006commit\030\007 \001(\01321.com.github.jt" + + "endermint.jabci.types.RequestCommitH\000\022A\n" + + "\005query\030\010 \001(\01320.com.github.jtendermint.ja" + + "bci.types.RequestQueryH\000\022J\n\ninit_chain\030\t" + + " \001(\01324.com.github.jtendermint.jabci.type" + + "s.RequestInitChainH\000\022L\n\013begin_block\030\n \001(" + + "\01325.com.github.jtendermint.jabci.types.R" + + "equestBeginBlockH\000\022H\n\tend_block\030\013 \001(\01323.", + "com.github.jtendermint.jabci.types.Reque" + + "stEndBlockH\000B\007\n\005value\"\036\n\013RequestEcho\022\017\n\007" + + "message\030\001 \001(\t\"\016\n\014RequestFlush\"\r\n\013Request" + + "Info\".\n\020RequestSetOption\022\013\n\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t\"\036\n\020RequestDeliverTx\022\n\n\002tx\030\001" + + " \001(\014\"\034\n\016RequestCheckTx\022\n\n\002tx\030\001 \001(\014\"I\n\014Re" + + "questQuery\022\014\n\004data\030\001 \001(\014\022\014\n\004path\030\002 \001(\t\022\016" + + "\n\006height\030\003 \001(\004\022\r\n\005prove\030\004 \001(\010\"\017\n\rRequest" + + "Commit\"U\n\020RequestInitChain\022A\n\nvalidators" + + "\030\001 \003(\0132-.com.github.jtendermint.jabci.ty", + "pes.Validator\"]\n\021RequestBeginBlock\022\014\n\004ha" + + "sh\030\001 \001(\014\022:\n\006header\030\002 \001(\0132*.com.github.jt" + + "endermint.jabci.types.Header\"!\n\017RequestE" + + "ndBlock\022\016\n\006height\030\001 \001(\004\"\373\006\n\010Response\022J\n\t" + + "exception\030\001 \001(\01325.com.github.jtendermint" + + ".jabci.types.ResponseExceptionH\000\022@\n\004echo" + + "\030\002 \001(\01320.com.github.jtendermint.jabci.ty" + + "pes.ResponseEchoH\000\022B\n\005flush\030\003 \001(\01321.com." + + "github.jtendermint.jabci.types.ResponseF" + + "lushH\000\022@\n\004info\030\004 \001(\01320.com.github.jtende", + "rmint.jabci.types.ResponseInfoH\000\022K\n\nset_" + + "option\030\005 \001(\01325.com.github.jtendermint.ja" + + "bci.types.ResponseSetOptionH\000\022K\n\ndeliver" + + "_tx\030\006 \001(\01325.com.github.jtendermint.jabci" + + ".types.ResponseDeliverTxH\000\022G\n\010check_tx\030\007" + + " \001(\01323.com.github.jtendermint.jabci.type" + + "s.ResponseCheckTxH\000\022D\n\006commit\030\010 \001(\01322.co" + + "m.github.jtendermint.jabci.types.Respons" + + "eCommitH\000\022B\n\005query\030\t \001(\01321.com.github.jt" + + "endermint.jabci.types.ResponseQueryH\000\022K\n", + "\ninit_chain\030\n \001(\01325.com.github.jtendermi" + + "nt.jabci.types.ResponseInitChainH\000\022M\n\013be" + + "gin_block\030\013 \001(\01326.com.github.jtendermint" + + ".jabci.types.ResponseBeginBlockH\000\022I\n\tend" + + "_block\030\014 \001(\01324.com.github.jtendermint.ja" + + "bci.types.ResponseEndBlockH\000B\007\n\005value\"\"\n" + + "\021ResponseException\022\r\n\005error\030\001 \001(\t\"\037\n\014Res" + + "ponseEcho\022\017\n\007message\030\001 \001(\t\"\017\n\rResponseFl" + + "ush\"e\n\014ResponseInfo\022\014\n\004data\030\001 \001(\t\022\017\n\007ver" + + "sion\030\002 \001(\t\022\031\n\021last_block_height\030\003 \001(\004\022\033\n", + "\023last_block_app_hash\030\004 \001(\014\" \n\021ResponseSe" + + "tOption\022\013\n\003log\030\001 \001(\t\"j\n\021ResponseDeliverT" + + "x\022:\n\004code\030\001 \001(\0162,.com.github.jtendermint" + + ".jabci.types.CodeType\022\014\n\004data\030\002 \001(\014\022\013\n\003l" + + "og\030\003 \001(\t\"h\n\017ResponseCheckTx\022:\n\004code\030\001 \001(" + + "\0162,.com.github.jtendermint.jabci.types.C" + + "odeType\022\014\n\004data\030\002 \001(\014\022\013\n\003log\030\003 \001(\t\"\242\001\n\rR" + + "esponseQuery\022:\n\004code\030\001 \001(\0162,.com.github." + + "jtendermint.jabci.types.CodeType\022\r\n\005inde" + + "x\030\002 \001(\003\022\013\n\003key\030\003 \001(\014\022\r\n\005value\030\004 \001(\014\022\r\n\005p", + "roof\030\005 \001(\014\022\016\n\006height\030\006 \001(\004\022\013\n\003log\030\007 \001(\t\"" + + "g\n\016ResponseCommit\022:\n\004code\030\001 \001(\0162,.com.gi" + + "thub.jtendermint.jabci.types.CodeType\022\014\n" + + "\004data\030\002 \001(\014\022\013\n\003log\030\003 \001(\t\"\023\n\021ResponseInit" + + "Chain\"\024\n\022ResponseBeginBlock\"P\n\020ResponseE" + + "ndBlock\022<\n\005diffs\030\001 \003(\0132-.com.github.jten" + + "dermint.jabci.types.Validator\"\345\001\n\006Header" + + "\022\020\n\010chain_id\030\001 \001(\t\022\016\n\006height\030\002 \001(\004\022\014\n\004ti" + + "me\030\003 \001(\004\022\017\n\007num_txs\030\004 \001(\004\022B\n\rlast_block_" + + "id\030\005 \001(\0132+.com.github.jtendermint.jabci.", + "types.BlockID\022\030\n\020last_commit_hash\030\006 \001(\014\022" + + "\021\n\tdata_hash\030\007 \001(\014\022\027\n\017validators_hash\030\010 " + + "\001(\014\022\020\n\010app_hash\030\t \001(\014\"Y\n\007BlockID\022\014\n\004hash" + + "\030\001 \001(\014\022@\n\005parts\030\002 \001(\01321.com.github.jtend" + + "ermint.jabci.types.PartSetHeader\",\n\rPart" + + "SetHeader\022\r\n\005total\030\001 \001(\004\022\014\n\004hash\030\002 \001(\014\"*" + + "\n\tValidator\022\016\n\006pubKey\030\001 \001(\014\022\r\n\005power\030\002 \001" + + "(\004*\265\005\n\010CodeType\022\006\n\002OK\020\000\022\021\n\rInternalError" + + "\020\001\022\021\n\rEncodingError\020\002\022\014\n\010BadNonce\020\003\022\020\n\014U" + + "nauthorized\020\004\022\025\n\021InsufficientFunds\020\005\022\022\n\016", + "UnknownRequest\020\006\022\030\n\024BaseDuplicateAddress" + + "\020e\022\025\n\021BaseEncodingError\020f\022\030\n\024BaseInsuffi" + + "cientFees\020g\022\031\n\025BaseInsufficientFunds\020h\022\034" + + "\n\030BaseInsufficientGasPrice\020i\022\024\n\020BaseInva" + + "lidInput\020j\022\025\n\021BaseInvalidOutput\020k\022\025\n\021Bas" + + "eInvalidPubKey\020l\022\027\n\023BaseInvalidSequence\020" + + "m\022\030\n\024BaseInvalidSignature\020n\022\026\n\022BaseUnkno" + + "wnAddress\020o\022\025\n\021BaseUnknownPubKey\020p\022\025\n\021Ba" + + "seUnknownPlugin\020q\022\025\n\020GovUnknownEntity\020\311\001" + + "\022\024\n\017GovUnknownGroup\020\312\001\022\027\n\022GovUnknownProp", + "osal\020\313\001\022\026\n\021GovDuplicateGroup\020\314\001\022\027\n\022GovDu" + + "plicateMember\020\315\001\022\031\n\024GovDuplicateProposal" + + "\020\316\001\022\025\n\020GovDuplicateVote\020\317\001\022\025\n\020GovInvalid" + + "Member\020\320\001\022\023\n\016GovInvalidVote\020\321\001\022\032\n\025GovInv" + + "alidVotingPower\020\322\0012\212\n\n\017ABCIApplication\022i" + + "\n\004Echo\022/.com.github.jtendermint.jabci.ty" + + "pes.RequestEcho\0320.com.github.jtendermint" + + ".jabci.types.ResponseEcho\022l\n\005Flush\0220.com" + + ".github.jtendermint.jabci.types.RequestF" + + "lush\0321.com.github.jtendermint.jabci.type", + "s.ResponseFlush\022i\n\004Info\022/.com.github.jte" + + "ndermint.jabci.types.RequestInfo\0320.com.g" + + "ithub.jtendermint.jabci.types.ResponseIn" + + "fo\022x\n\tSetOption\0224.com.github.jtendermint" + + ".jabci.types.RequestSetOption\0325.com.gith" + + "ub.jtendermint.jabci.types.ResponseSetOp" + + "tion\022x\n\tDeliverTx\0224.com.github.jtendermi" + + "nt.jabci.types.RequestDeliverTx\0325.com.gi" + + "thub.jtendermint.jabci.types.ResponseDel" + + "iverTx\022r\n\007CheckTx\0222.com.github.jtendermi", + "nt.jabci.types.RequestCheckTx\0323.com.gith" + + "ub.jtendermint.jabci.types.ResponseCheck" + + "Tx\022l\n\005Query\0220.com.github.jtendermint.jab" + + "ci.types.RequestQuery\0321.com.github.jtend" + + "ermint.jabci.types.ResponseQuery\022o\n\006Comm" + + "it\0221.com.github.jtendermint.jabci.types." + + "RequestCommit\0322.com.github.jtendermint.j" + + "abci.types.ResponseCommit\022x\n\tInitChain\0224" + ".com.github.jtendermint.jabci.types.Requ" + - "estSetOptionH\000\022J\n\ndeliver_tx\030\005 \001(\01324.com" + - ".github.jtendermint.jabci.types.RequestD", - "eliverTxH\000\022F\n\010check_tx\030\006 \001(\01322.com.githu" + - "b.jtendermint.jabci.types.RequestCheckTx" + - "H\000\022C\n\006commit\030\007 \001(\01321.com.github.jtenderm" + - "int.jabci.types.RequestCommitH\000\022A\n\005query" + - "\030\010 \001(\01320.com.github.jtendermint.jabci.ty" + - "pes.RequestQueryH\000\022J\n\ninit_chain\030\t \001(\01324" + - ".com.github.jtendermint.jabci.types.Requ" + - "estInitChainH\000\022L\n\013begin_block\030\n \001(\01325.co" + - "m.github.jtendermint.jabci.types.Request" + - "BeginBlockH\000\022H\n\tend_block\030\013 \001(\01323.com.gi", - "thub.jtendermint.jabci.types.RequestEndB" + - "lockH\000B\007\n\005value\"\036\n\013RequestEcho\022\017\n\007messag" + - "e\030\001 \001(\t\"\016\n\014RequestFlush\"\r\n\013RequestInfo\"." + - "\n\020RequestSetOption\022\013\n\003key\030\001 \001(\t\022\r\n\005value" + - "\030\002 \001(\t\"\036\n\020RequestDeliverTx\022\n\n\002tx\030\001 \001(\014\"\034" + - "\n\016RequestCheckTx\022\n\n\002tx\030\001 \001(\014\"I\n\014RequestQ" + - "uery\022\014\n\004data\030\001 \001(\014\022\014\n\004path\030\002 \001(\t\022\016\n\006heig" + - "ht\030\003 \001(\004\022\r\n\005prove\030\004 \001(\010\"\017\n\rRequestCommit" + - "\"U\n\020RequestInitChain\022A\n\nvalidators\030\001 \003(\013" + - "2-.com.github.jtendermint.jabci.types.Va", - "lidator\"]\n\021RequestBeginBlock\022\014\n\004hash\030\001 \001" + - "(\014\022:\n\006header\030\002 \001(\0132*.com.github.jtenderm" + - "int.jabci.types.Header\"!\n\017RequestEndBloc" + - "k\022\016\n\006height\030\001 \001(\004\"\373\006\n\010Response\022J\n\texcept" + - "ion\030\001 \001(\01325.com.github.jtendermint.jabci" + - ".types.ResponseExceptionH\000\022@\n\004echo\030\002 \001(\013" + - "20.com.github.jtendermint.jabci.types.Re" + - "sponseEchoH\000\022B\n\005flush\030\003 \001(\01321.com.github" + - ".jtendermint.jabci.types.ResponseFlushH\000" + - "\022@\n\004info\030\004 \001(\01320.com.github.jtendermint.", - "jabci.types.ResponseInfoH\000\022K\n\nset_option" + - "\030\005 \001(\01325.com.github.jtendermint.jabci.ty" + - "pes.ResponseSetOptionH\000\022K\n\ndeliver_tx\030\006 " + - "\001(\01325.com.github.jtendermint.jabci.types" + - ".ResponseDeliverTxH\000\022G\n\010check_tx\030\007 \001(\01323" + - ".com.github.jtendermint.jabci.types.Resp" + - "onseCheckTxH\000\022D\n\006commit\030\010 \001(\01322.com.gith" + - "ub.jtendermint.jabci.types.ResponseCommi" + - "tH\000\022B\n\005query\030\t \001(\01321.com.github.jtenderm" + - "int.jabci.types.ResponseQueryH\000\022K\n\ninit_", - "chain\030\n \001(\01325.com.github.jtendermint.jab" + - "ci.types.ResponseInitChainH\000\022M\n\013begin_bl" + - "ock\030\013 \001(\01326.com.github.jtendermint.jabci" + - ".types.ResponseBeginBlockH\000\022I\n\tend_block" + - "\030\014 \001(\01324.com.github.jtendermint.jabci.ty" + - "pes.ResponseEndBlockH\000B\007\n\005value\"\"\n\021Respo" + - "nseException\022\r\n\005error\030\001 \001(\t\"\037\n\014ResponseE" + - "cho\022\017\n\007message\030\001 \001(\t\"\017\n\rResponseFlush\"e\n" + - "\014ResponseInfo\022\014\n\004data\030\001 \001(\t\022\017\n\007version\030\002" + - " \001(\t\022\031\n\021last_block_height\030\003 \001(\004\022\033\n\023last_", - "block_app_hash\030\004 \001(\014\" \n\021ResponseSetOptio" + - "n\022\013\n\003log\030\001 \001(\t\"j\n\021ResponseDeliverTx\022:\n\004c" + - "ode\030\001 \001(\0162,.com.github.jtendermint.jabci" + - ".types.CodeType\022\014\n\004data\030\002 \001(\014\022\013\n\003log\030\003 \001" + - "(\t\"h\n\017ResponseCheckTx\022:\n\004code\030\001 \001(\0162,.co" + - "m.github.jtendermint.jabci.types.CodeTyp" + - "e\022\014\n\004data\030\002 \001(\014\022\013\n\003log\030\003 \001(\t\"\242\001\n\rRespons" + - "eQuery\022:\n\004code\030\001 \001(\0162,.com.github.jtende" + - "rmint.jabci.types.CodeType\022\r\n\005index\030\002 \001(" + - "\003\022\013\n\003key\030\003 \001(\014\022\r\n\005value\030\004 \001(\014\022\r\n\005proof\030\005", - " \001(\014\022\016\n\006height\030\006 \001(\004\022\013\n\003log\030\007 \001(\t\"g\n\016Res" + - "ponseCommit\022:\n\004code\030\001 \001(\0162,.com.github.j" + - "tendermint.jabci.types.CodeType\022\014\n\004data\030" + - "\002 \001(\014\022\013\n\003log\030\003 \001(\t\"\023\n\021ResponseInitChain\"" + - "\024\n\022ResponseBeginBlock\"P\n\020ResponseEndBloc" + - "k\022<\n\005diffs\030\001 \003(\0132-.com.github.jtendermin" + - "t.jabci.types.Validator\"\345\001\n\006Header\022\020\n\010ch" + - "ain_id\030\001 \001(\t\022\016\n\006height\030\002 \001(\004\022\014\n\004time\030\003 \001" + - "(\004\022\017\n\007num_txs\030\004 \001(\004\022B\n\rlast_block_id\030\005 \001" + - "(\0132+.com.github.jtendermint.jabci.types.", - "BlockID\022\030\n\020last_commit_hash\030\006 \001(\014\022\021\n\tdat" + - "a_hash\030\007 \001(\014\022\027\n\017validators_hash\030\010 \001(\014\022\020\n" + - "\010app_hash\030\t \001(\014\"Y\n\007BlockID\022\014\n\004hash\030\001 \001(\014" + - "\022@\n\005parts\030\002 \001(\01321.com.github.jtendermint" + - ".jabci.types.PartSetHeader\",\n\rPartSetHea" + - "der\022\r\n\005total\030\001 \001(\004\022\014\n\004hash\030\002 \001(\014\"*\n\tVali" + - "dator\022\016\n\006pubKey\030\001 \001(\014\022\r\n\005power\030\002 \001(\004*\273\001\n" + - "\013MessageType\022\017\n\013NullMessage\020\000\022\010\n\004Echo\020\001\022" + - "\t\n\005Flush\020\002\022\010\n\004Info\020\003\022\r\n\tSetOption\020\004\022\r\n\tE" + - "xception\020\005\022\r\n\tDeliverTx\020\021\022\013\n\007CheckTx\020\022\022\n", - "\n\006Commit\020\023\022\t\n\005Query\020\024\022\r\n\tInitChain\020\025\022\016\n\n" + - "BeginBlock\020\026\022\014\n\010EndBlock\020\027*\265\005\n\010CodeType\022" + - "\006\n\002OK\020\000\022\021\n\rInternalError\020\001\022\021\n\rEncodingEr" + - "ror\020\002\022\014\n\010BadNonce\020\003\022\020\n\014Unauthorized\020\004\022\025\n" + - "\021InsufficientFunds\020\005\022\022\n\016UnknownRequest\020\006" + - "\022\030\n\024BaseDuplicateAddress\020e\022\025\n\021BaseEncodi" + - "ngError\020f\022\030\n\024BaseInsufficientFees\020g\022\031\n\025B" + - "aseInsufficientFunds\020h\022\034\n\030BaseInsufficie" + - "ntGasPrice\020i\022\024\n\020BaseInvalidInput\020j\022\025\n\021Ba" + - "seInvalidOutput\020k\022\025\n\021BaseInvalidPubKey\020l", - "\022\027\n\023BaseInvalidSequence\020m\022\030\n\024BaseInvalid" + - "Signature\020n\022\026\n\022BaseUnknownAddress\020o\022\025\n\021B" + - "aseUnknownPubKey\020p\022\025\n\021BaseUnknownPlugin\020" + - "q\022\025\n\020GovUnknownEntity\020\311\001\022\024\n\017GovUnknownGr" + - "oup\020\312\001\022\027\n\022GovUnknownProposal\020\313\001\022\026\n\021GovDu" + - "plicateGroup\020\314\001\022\027\n\022GovDuplicateMember\020\315\001" + - "\022\031\n\024GovDuplicateProposal\020\316\001\022\025\n\020GovDuplic" + - "ateVote\020\317\001\022\025\n\020GovInvalidMember\020\320\001\022\023\n\016Gov" + - "InvalidVote\020\321\001\022\032\n\025GovInvalidVotingPower\020" + - "\322\0012\212\n\n\017ABCIApplication\022i\n\004Echo\022/.com.git", - "hub.jtendermint.jabci.types.RequestEcho\032" + - "0.com.github.jtendermint.jabci.types.Res" + - "ponseEcho\022l\n\005Flush\0220.com.github.jtenderm" + - "int.jabci.types.RequestFlush\0321.com.githu" + - "b.jtendermint.jabci.types.ResponseFlush\022" + - "i\n\004Info\022/.com.github.jtendermint.jabci.t" + - "ypes.RequestInfo\0320.com.github.jtendermin" + - "t.jabci.types.ResponseInfo\022x\n\tSetOption\022" + - "4.com.github.jtendermint.jabci.types.Req" + - "uestSetOption\0325.com.github.jtendermint.j", - "abci.types.ResponseSetOption\022x\n\tDeliverT" + - "x\0224.com.github.jtendermint.jabci.types.R" + - "equestDeliverTx\0325.com.github.jtendermint" + - ".jabci.types.ResponseDeliverTx\022r\n\007CheckT" + - "x\0222.com.github.jtendermint.jabci.types.R" + - "equestCheckTx\0323.com.github.jtendermint.j" + - "abci.types.ResponseCheckTx\022l\n\005Query\0220.co" + - "m.github.jtendermint.jabci.types.Request" + - "Query\0321.com.github.jtendermint.jabci.typ" + - "es.ResponseQuery\022o\n\006Commit\0221.com.github.", - "jtendermint.jabci.types.RequestCommit\0322." + - "com.github.jtendermint.jabci.types.Respo" + - "nseCommit\022x\n\tInitChain\0224.com.github.jten" + - "dermint.jabci.types.RequestInitChain\0325.c" + - "om.github.jtendermint.jabci.types.Respon" + - "seInitChain\022{\n\nBeginBlock\0225.com.github.j" + - "tendermint.jabci.types.RequestBeginBlock" + - "\0326.com.github.jtendermint.jabci.types.Re" + - "sponseBeginBlock\022u\n\010EndBlock\0223.com.githu" + - "b.jtendermint.jabci.types.RequestEndBloc", - "k\0324.com.github.jtendermint.jabci.types.R" + - "esponseEndBlockb\006proto3" + "estInitChain\0325.com.github.jtendermint.ja", + "bci.types.ResponseInitChain\022{\n\nBeginBloc" + + "k\0225.com.github.jtendermint.jabci.types.R" + + "equestBeginBlock\0326.com.github.jtendermin" + + "t.jabci.types.ResponseBeginBlock\022u\n\010EndB" + + "lock\0223.com.github.jtendermint.jabci.type" + + "s.RequestEndBlock\0324.com.github.jtendermi" + + "nt.jabci.types.ResponseEndBlockb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/src/main/proto/types.proto b/src/main/proto/types.proto index 52df52c..24719cf 100644 --- a/src/main/proto/types.proto +++ b/src/main/proto/types.proto @@ -3,30 +3,6 @@ package com.github.jtendermint.jabci.types; // This file is copied from http://github.com/tendermint/abci -//---------------------------------------- -// Message types - -// Not being used -// Could be added to request/response -// so we don't have to type switch -// (would be twice as fast, but we're talking about 15ns) -enum MessageType { - NullMessage = 0x00; - - Echo = 0x01; - Flush = 0x02; - Info = 0x03; - SetOption = 0x04; - Exception = 0x05; - DeliverTx = 0x11; - CheckTx = 0x12; - Commit = 0x13; - Query = 0x14; - InitChain = 0x15; - BeginBlock = 0x16; - EndBlock = 0x17; -} - //---------------------------------------- // Code types @@ -116,7 +92,7 @@ message RequestQuery{ bytes data = 1; string path = 2; uint64 height = 3; - bool prove = 4; + bool prove = 4; } message RequestCommit{