From fe93c3a0d1dfb93f9f528efa756938671d0f5210 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Wed, 11 Sep 2019 12:14:50 +0300 Subject: [PATCH] WIP --- .../github/jtendermint/jabci/JavaCounter.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/github/jtendermint/jabci/JavaCounter.java b/src/main/java/com/github/jtendermint/jabci/JavaCounter.java index 24dc1a6..10b6db2 100644 --- a/src/main/java/com/github/jtendermint/jabci/JavaCounter.java +++ b/src/main/java/com/github/jtendermint/jabci/JavaCounter.java @@ -23,33 +23,22 @@ */ package com.github.jtendermint.jabci; +import com.github.jtendermint.jabci.api.*; +import com.github.jtendermint.jabci.socket.ExceptionListener.Event; +import com.github.jtendermint.jabci.socket.TSocket; +import com.github.jtendermint.jabci.types.*; +import com.google.protobuf.ByteString; + import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.Charset; -import com.github.jtendermint.jabci.api.CodeType; -import com.github.jtendermint.jabci.api.ICheckTx; -import com.github.jtendermint.jabci.api.ICommit; -import com.github.jtendermint.jabci.api.IDeliverTx; -import com.github.jtendermint.jabci.api.IQuery; -import com.github.jtendermint.jabci.socket.ExceptionListener.Event; -import com.github.jtendermint.jabci.socket.TSocket; -import com.github.jtendermint.jabci.types.RequestCheckTx; -import com.github.jtendermint.jabci.types.RequestCommit; -import com.github.jtendermint.jabci.types.RequestDeliverTx; -import com.github.jtendermint.jabci.types.RequestQuery; -import com.github.jtendermint.jabci.types.ResponseCheckTx; -import com.github.jtendermint.jabci.types.ResponseCommit; -import com.github.jtendermint.jabci.types.ResponseDeliverTx; -import com.github.jtendermint.jabci.types.ResponseQuery; -import com.google.protobuf.ByteString; - /** * Implements a sample counter app. every tx-data must be bigger than the current amount of tx * * @author wolfposd */ -public final class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery { +public final class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery, IBeginBlock { private int hashCount = 0; private int txCount = 0; @@ -154,13 +143,25 @@ public final class JavaCounter implements IDeliverTx, ICheckTx, ICommit, IQuery switch (query) { case "hash": return ResponseQuery.newBuilder().setCode(CodeType.OK) - .setValue(ByteString.copyFrom(("" + hashCount).getBytes(Charset.forName("UTF-8")))).build(); + .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(); + .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(); + .build(); } } + + @Override + public ResponseBeginBlock requestBeginBlock(RequestBeginBlock req) { + req + .getLastCommitInfo() + .getVotesList() + .stream() + .map(v -> v.getFullVote().toString()) + .forEach(v -> System.out.println("BeginBlock vote:" + v)); + + return ResponseBeginBlock.newBuilder().build(); + } }