mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-20 15:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into callum/merge-spec

Browse Source
This commit is contained in:
Callum Waters
2022-02-15 11:55:29 +01:00
parent 5ac86e0325 44d9e9917c
commit 417e6b5e85
166 changed files with 2860 additions and 3974 deletions
Download Patch File Download Diff File Expand all files Collapse all files
light/example_test.go
+15 -21
View File
@@ -2,8 +2,7 @@ package light_test
import (
"context"
stdlog "log"
"os"
"testing"
"time"
dbm "github.com/tendermint/tm-db"
@@ -17,17 +16,17 @@ import (
)
// Manually getting light blocks and verifying them.
func ExampleClient() {
func TestExampleClient(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := rpctest.CreateConfig("ExampleClient_VerifyLightBlockAtHeight")
conf, err := rpctest.CreateConfig(t, "ExampleClient_VerifyLightBlockAtHeight")
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
logger, err := log.NewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
// Start a test application
@@ -35,21 +34,16 @@ func ExampleClient() {
_, closer, err := rpctest.StartTendermint(ctx, conf, app, rpctest.SuppressStdout)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
defer func() { _ = closer(ctx) }()
dbDir, err := os.MkdirTemp("", "light-client-example")
if err != nil {
stdlog.Fatal(err)
}
defer os.RemoveAll(dbDir)
dbDir := t.TempDir()
chainID := conf.ChainID()
primary, err := httpp.New(chainID, conf.RPC.ListenAddress)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
// give Tendermint time to generate some blocks
@@ -57,12 +51,12 @@ func ExampleClient() {
block, err := primary.LightBlock(ctx, 2)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
db, err := dbm.NewGoLevelDB("light-client-db", dbDir)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
c, err := light.NewClient(ctx,
@@ -78,11 +72,11 @@ func ExampleClient() {
light.Logger(logger),
)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
defer func() {
if err := c.Cleanup(); err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
}()
@@ -92,19 +86,19 @@ func ExampleClient() {
// veify the block at height 3
_, err = c.VerifyLightBlockAtHeight(ctx, 3, time.Now())
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
// retrieve light block at height 3
_, err = c.TrustedLightBlock(3)
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
// update to the latest height
lb, err := c.Update(ctx, time.Now())
if err != nil {
stdlog.Fatal(err)
t.Fatal(err)
}
logger.Info("verified light block", "light-block", lb)
light/helpers_test.go
+1
View File
@@ -6,6 +6,7 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
"github.com/tendermint/tendermint/crypto/tmhash"
light/light_test.go
+6 -16
View File
@@ -2,7 +2,6 @@ package light_test
import (
"context"
"os"
"testing"
"time"
@@ -28,7 +27,7 @@ func TestClientIntegration_Update(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := rpctest.CreateConfig(t.Name())
conf, err := rpctest.CreateConfig(t, t.Name())
require.NoError(t, err)
logger := log.NewTestingLogger(t)
@@ -42,10 +41,7 @@ func TestClientIntegration_Update(t *testing.T) {
// give Tendermint time to generate some blocks
time.Sleep(5 * time.Second)
dbDir, err := os.MkdirTemp("", "light-client-test-update-example")
require.NoError(t, err)
defer os.RemoveAll(dbDir)
dbDir := t.TempDir()
chainID := conf.ChainID()
primary, err := httpp.New(chainID, conf.RPC.ListenAddress)
@@ -91,7 +87,7 @@ func TestClientIntegration_VerifyLightBlockAtHeight(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := rpctest.CreateConfig(t.Name())
conf, err := rpctest.CreateConfig(t, t.Name())
require.NoError(t, err)
logger := log.NewTestingLogger(t)
@@ -103,10 +99,7 @@ func TestClientIntegration_VerifyLightBlockAtHeight(t *testing.T) {
require.NoError(t, err)
defer func() { require.NoError(t, closer(ctx)) }()
dbDir, err := os.MkdirTemp("", "light-client-test-verify-example")
require.NoError(t, err)
defer os.RemoveAll(dbDir)
dbDir := t.TempDir()
chainID := conf.ChainID()
primary, err := httpp.New(chainID, conf.RPC.ListenAddress)
@@ -171,7 +164,7 @@ func waitForBlock(ctx context.Context, p provider.Provider, height int64) (*type
func TestClientStatusRPC(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := rpctest.CreateConfig(t.Name())
conf, err := rpctest.CreateConfig(t, t.Name())
require.NoError(t, err)
// Start a test application
@@ -181,10 +174,7 @@ func TestClientStatusRPC(t *testing.T) {
require.NoError(t, err)
defer func() { require.NoError(t, closer(ctx)) }()
dbDir, err := os.MkdirTemp("", "light-client-test-status-example")
require.NoError(t, err)
t.Cleanup(func() { os.RemoveAll(dbDir) })
dbDir := t.TempDir()
chainID := conf.ChainID()
primary, err := httpp.New(chainID, conf.RPC.ListenAddress)
light/provider/http/http_test.go
+1 -1
View File
@@ -35,7 +35,7 @@ func TestNewProvider(t *testing.T) {
func TestProvider(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cfg, err := rpctest.CreateConfig(t.Name())
cfg, err := rpctest.CreateConfig(t, t.Name())
require.NoError(t, err)
// start a tendermint node in the background to test against
light/rpc/client.go
+5 -13
View File
@@ -446,27 +446,19 @@ func (c *Client) BlockResults(ctx context.Context, height *int64) (*coretypes.Re
return nil, err
}
// proto-encode BeginBlock events
bbeBytes, err := proto.Marshal(&abci.ResponseBeginBlock{
Events: res.BeginBlockEvents,
// proto-encode FinalizeBlock events
bbeBytes, err := proto.Marshal(&abci.ResponseFinalizeBlock{
Events: res.FinalizeBlockEvents,
})
if err != nil {
return nil, err
}
// Build a Merkle tree of proto-encoded DeliverTx results and get a hash.
// Build a Merkle tree of proto-encoded FinalizeBlock tx results and get a hash.
results := types.NewResults(res.TxsResults)
// proto-encode EndBlock events.
ebeBytes, err := proto.Marshal(&abci.ResponseEndBlock{
Events: res.EndBlockEvents,
})
if err != nil {
return nil, err
}
// Build a Merkle tree out of the above 3 binary slices.
rH := merkle.HashFromByteSlices([][]byte{bbeBytes, results.Hash(), ebeBytes})
rH := merkle.HashFromByteSlices([][]byte{bbeBytes, results.Hash()})
// Verify block results.
if !bytes.Equal(rH, trustedBlock.LastResultsHash) {