diff --git a/benchmarks/bench_test.go b/benchmarks/bench_test.go index 3c09dc8a..0cb45234 100644 --- a/benchmarks/bench_test.go +++ b/benchmarks/bench_test.go @@ -2,9 +2,9 @@ package benchmarks import ( "encoding/json" - "fmt" "io/ioutil" "testing" + "time" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -68,7 +68,7 @@ func BenchmarkNCw20SendTxPerBlock(b *testing.B) { // wasm setup height := int64(2) - benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height}}) + benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height, Time: time.Now()}}) // upload the code cw20Code, err := ioutil.ReadFile("./testdata/cw20_base.wasm") @@ -81,7 +81,6 @@ func BenchmarkNCw20SendTxPerBlock(b *testing.B) { require.NoError(b, err) _, res, err := benchmarkApp.Deliver(txGen.TxEncoder(), storeTx) require.NoError(b, err) - fmt.Printf("Data: %X\n", res.Data) codeID := uint64(1) // instantiate the contract @@ -108,8 +107,9 @@ func BenchmarkNCw20SendTxPerBlock(b *testing.B) { _, res, err = benchmarkApp.Deliver(txGen.TxEncoder(), initTx) require.NoError(b, err) // TODO: parse contract address - fmt.Printf("Data: %X\n", res.Data) - contractAddr := "wasm123456789" + evt := res.Events[len(res.Events)-1] + attr := evt.Attributes[0] + contractAddr := string(attr.Value) benchmarkApp.EndBlock(abci.RequestEndBlock{Height: height}) benchmarkApp.Commit() @@ -136,7 +136,7 @@ func BenchmarkNCw20SendTxPerBlock(b *testing.B) { // Run this with a profiler, so its easy to distinguish what time comes from // Committing, and what time comes from Check/Deliver Tx. for i := 0; i < b.N/blockSize; i++ { - benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height}}) + benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height, Time: time.Now()}}) for j := 0; j < blockSize; j++ { idx := i*blockSize + j diff --git a/benchmarks/testdata/cw1_whitelist.wasm b/benchmarks/testdata/cw1_whitelist.wasm index 373142fd..5a9d6400 100644 Binary files a/benchmarks/testdata/cw1_whitelist.wasm and b/benchmarks/testdata/cw1_whitelist.wasm differ diff --git a/benchmarks/testdata/cw20_base.wasm b/benchmarks/testdata/cw20_base.wasm index ef90cdc6..901136e5 100644 Binary files a/benchmarks/testdata/cw20_base.wasm and b/benchmarks/testdata/cw20_base.wasm differ diff --git a/benchmarks/testdata/version.txt b/benchmarks/testdata/version.txt index a23a1878..8e36c89c 100644 --- a/benchmarks/testdata/version.txt +++ b/benchmarks/testdata/version.txt @@ -1 +1 @@ -v0.10.0-soon3 +v0.10.0-soon4