Browse Source
Merge branch 'feature/tx-proof' into feature/237-tx-indexing
Conflicts: types/tx.gopull/412/head
Ethan Buchman
8 years ago
9 changed files with 268 additions and 89 deletions
Split View
Diff Options
-
+3 -1benchmarks/simu/counter.go
-
+17 -15glide.lock
-
+2 -0glide.yaml
-
+18 -14rpc/client/httpclient.go
-
+41 -54rpc/test/client_test.go
-
+4 -4rpc/test/helpers.go
-
+1 -1scripts/install_abci_apps.sh
-
+60 -0types/tx.go
-
+122 -0types/tx_test.go
+ 3
- 1
benchmarks/simu/counter.go
View File
+ 17
- 15
glide.lock
View File
+ 2
- 0
glide.yaml
View File
+ 18
- 14
rpc/client/httpclient.go
View File
+ 41
- 54
rpc/test/client_test.go
View File
+ 4
- 4
rpc/test/helpers.go
View File
+ 1
- 1
scripts/install_abci_apps.sh
View File
+ 60
- 0
types/tx.go
View File
+ 122
- 0
types/tx_test.go
View File
| @ -0,0 +1,122 @@ | |||
| package types | |||
| import ( | |||
| "bytes" | |||
| "testing" | |||
| "github.com/stretchr/testify/assert" | |||
| cmn "github.com/tendermint/go-common" | |||
| ctest "github.com/tendermint/go-common/test" | |||
| wire "github.com/tendermint/go-wire" | |||
| ) | |||
| func makeTxs(cnt, size int) Txs { | |||
| txs := make(Txs, cnt) | |||
| for i := 0; i < cnt; i++ { | |||
| txs[i] = cmn.RandBytes(size) | |||
| } | |||
| return txs | |||
| } | |||
| func randInt(low, high int) int { | |||
| off := cmn.RandInt() % (high - low) | |||
| return low + off | |||
| } | |||
| func TestTxIndex(t *testing.T) { | |||
| assert := assert.New(t) | |||
| for i := 0; i < 20; i++ { | |||
| txs := makeTxs(15, 60) | |||
| for j := 0; j < len(txs); j++ { | |||
| tx := txs[j] | |||
| idx := txs.Index(tx) | |||
| assert.Equal(j, idx) | |||
| } | |||
| assert.Equal(-1, txs.Index(nil)) | |||
| assert.Equal(-1, txs.Index(Tx("foodnwkf"))) | |||
| } | |||
| } | |||
| func TestValidTxProof(t *testing.T) { | |||
| assert := assert.New(t) | |||
| cases := []struct { | |||
| txs Txs | |||
| }{ | |||
| {Txs{{1, 4, 34, 87, 163, 1}}}, | |||
| {Txs{{5, 56, 165, 2}, {4, 77}}}, | |||
| {Txs{Tx("foo"), Tx("bar"), Tx("baz")}}, | |||
| {makeTxs(20, 5)}, | |||
| {makeTxs(7, 81)}, | |||
| {makeTxs(61, 15)}, | |||
| } | |||
| for h, tc := range cases { | |||
| txs := tc.txs | |||
| root := txs.Hash() | |||
| // make sure valid proof for every tx | |||
| for i := range txs { | |||
| leaf := txs[i] | |||
| leafHash := leaf.Hash() | |||
| proof := txs.Proof(i) | |||
| assert.Equal(i, proof.Index, "%d: %d", h, i) | |||
| assert.Equal(len(txs), proof.Total, "%d: %d", h, i) | |||
| assert.Equal(root, proof.RootHash, "%d: %d", h, i) | |||
| assert.Equal(leaf, proof.Data, "%d: %d", h, i) | |||
| assert.Equal(leafHash, proof.LeafHash(), "%d: %d", h, i) | |||
| assert.Nil(proof.Validate(root), "%d: %d", h, i) | |||
| assert.NotNil(proof.Validate([]byte("foobar")), "%d: %d", h, i) | |||
| // read-write must also work | |||
| var p2 TxProof | |||
| bin := wire.BinaryBytes(proof) | |||
| err := wire.ReadBinaryBytes(bin, &p2) | |||
| if assert.Nil(err, "%d: %d: %+v", h, i, err) { | |||
| assert.Nil(p2.Validate(root), "%d: %d", h, i) | |||
| } | |||
| } | |||
| } | |||
| } | |||
| func TestTxProofUnchangable(t *testing.T) { | |||
| // run the other test a bunch... | |||
| for i := 0; i < 40; i++ { | |||
| testTxProofUnchangable(t) | |||
| } | |||
| } | |||
| func testTxProofUnchangable(t *testing.T) { | |||
| assert := assert.New(t) | |||
| // make some proof | |||
| txs := makeTxs(randInt(2, 100), randInt(16, 128)) | |||
| root := txs.Hash() | |||
| i := randInt(0, len(txs)-1) | |||
| proof := txs.Proof(i) | |||
| // make sure it is valid to start with | |||
| assert.Nil(proof.Validate(root)) | |||
| bin := wire.BinaryBytes(proof) | |||
| // try mutating the data and make sure nothing breaks | |||
| for j := 0; j < 500; j++ { | |||
| bad := ctest.MutateByteSlice(bin) | |||
| if !bytes.Equal(bad, bin) { | |||
| assertBadProof(t, root, bad, proof) | |||
| } | |||
| } | |||
| } | |||
| // this make sure the proof doesn't deserialize into something valid | |||
| func assertBadProof(t *testing.T, root []byte, bad []byte, good TxProof) { | |||
| var proof TxProof | |||
| err := wire.ReadBinaryBytes(bad, &proof) | |||
| if err == nil { | |||
| err = proof.Validate(root) | |||
| if err == nil { | |||
| // okay, this can happen if we have a slightly different total | |||
| // (where the path ends up the same), if it is something else, we have | |||
| // a real problem | |||
| assert.NotEqual(t, proof.Total, good.Total, "bad: %#v\ngood: %#v", proof, good) | |||
| } | |||
| } | |||
| } | |||