mirror of https://github.com/poanetwork/gecko.git
removed duplicated batch writes, fixed tests
This commit is contained in:
parent
db01f2e7e9
commit
473bef24b1
|
@ -234,9 +234,6 @@ func (db *Database) commitBatch() (database.Batch, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := db.batch.Write(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return db.batch, nil
|
return db.batch, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import (
|
||||||
|
|
||||||
"github.com/ava-labs/gecko/chains/atomic"
|
"github.com/ava-labs/gecko/chains/atomic"
|
||||||
"github.com/ava-labs/gecko/database/memdb"
|
"github.com/ava-labs/gecko/database/memdb"
|
||||||
|
"github.com/ava-labs/gecko/database/prefixdb"
|
||||||
"github.com/ava-labs/gecko/ids"
|
"github.com/ava-labs/gecko/ids"
|
||||||
"github.com/ava-labs/gecko/snow"
|
"github.com/ava-labs/gecko/snow"
|
||||||
"github.com/ava-labs/gecko/snow/engine/common"
|
"github.com/ava-labs/gecko/snow/engine/common"
|
||||||
|
@ -117,9 +118,10 @@ func TestIssueExportTx(t *testing.T) {
|
||||||
genesisBytes := BuildGenesisTest(t)
|
genesisBytes := BuildGenesisTest(t)
|
||||||
|
|
||||||
issuer := make(chan common.Message, 1)
|
issuer := make(chan common.Message, 1)
|
||||||
|
baseDB := memdb.New()
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, baseDB))
|
||||||
|
|
||||||
ctx := snow.DefaultContextTest()
|
ctx := snow.DefaultContextTest()
|
||||||
ctx.NetworkID = networkID
|
ctx.NetworkID = networkID
|
||||||
|
@ -138,7 +140,7 @@ func TestIssueExportTx(t *testing.T) {
|
||||||
}
|
}
|
||||||
err := vm.Initialize(
|
err := vm.Initialize(
|
||||||
ctx,
|
ctx,
|
||||||
memdb.New(),
|
prefixdb.New([]byte{1}, baseDB),
|
||||||
genesisBytes,
|
genesisBytes,
|
||||||
issuer,
|
issuer,
|
||||||
[]*common.Fx{{
|
[]*common.Fx{{
|
||||||
|
@ -273,9 +275,10 @@ func TestClearForceAcceptedExportTx(t *testing.T) {
|
||||||
genesisBytes := BuildGenesisTest(t)
|
genesisBytes := BuildGenesisTest(t)
|
||||||
|
|
||||||
issuer := make(chan common.Message, 1)
|
issuer := make(chan common.Message, 1)
|
||||||
|
baseDB := memdb.New()
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, baseDB))
|
||||||
|
|
||||||
ctx := snow.DefaultContextTest()
|
ctx := snow.DefaultContextTest()
|
||||||
ctx.NetworkID = networkID
|
ctx.NetworkID = networkID
|
||||||
|
@ -294,7 +297,7 @@ func TestClearForceAcceptedExportTx(t *testing.T) {
|
||||||
}
|
}
|
||||||
err := vm.Initialize(
|
err := vm.Initialize(
|
||||||
ctx,
|
ctx,
|
||||||
memdb.New(),
|
prefixdb.New([]byte{1}, baseDB),
|
||||||
genesisBytes,
|
genesisBytes,
|
||||||
issuer,
|
issuer,
|
||||||
[]*common.Fx{{
|
[]*common.Fx{{
|
||||||
|
|
|
@ -9,6 +9,7 @@ import (
|
||||||
|
|
||||||
"github.com/ava-labs/gecko/chains/atomic"
|
"github.com/ava-labs/gecko/chains/atomic"
|
||||||
"github.com/ava-labs/gecko/database/memdb"
|
"github.com/ava-labs/gecko/database/memdb"
|
||||||
|
"github.com/ava-labs/gecko/database/prefixdb"
|
||||||
"github.com/ava-labs/gecko/ids"
|
"github.com/ava-labs/gecko/ids"
|
||||||
"github.com/ava-labs/gecko/snow"
|
"github.com/ava-labs/gecko/snow"
|
||||||
"github.com/ava-labs/gecko/snow/engine/common"
|
"github.com/ava-labs/gecko/snow/engine/common"
|
||||||
|
@ -106,9 +107,10 @@ func TestIssueImportTx(t *testing.T) {
|
||||||
genesisBytes := BuildGenesisTest(t)
|
genesisBytes := BuildGenesisTest(t)
|
||||||
|
|
||||||
issuer := make(chan common.Message, 1)
|
issuer := make(chan common.Message, 1)
|
||||||
|
baseDB := memdb.New()
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, baseDB))
|
||||||
|
|
||||||
ctx := snow.DefaultContextTest()
|
ctx := snow.DefaultContextTest()
|
||||||
ctx.NetworkID = networkID
|
ctx.NetworkID = networkID
|
||||||
|
@ -127,7 +129,7 @@ func TestIssueImportTx(t *testing.T) {
|
||||||
}
|
}
|
||||||
err := vm.Initialize(
|
err := vm.Initialize(
|
||||||
ctx,
|
ctx,
|
||||||
memdb.New(),
|
prefixdb.New([]byte{1}, baseDB),
|
||||||
genesisBytes,
|
genesisBytes,
|
||||||
issuer,
|
issuer,
|
||||||
[]*common.Fx{{
|
[]*common.Fx{{
|
||||||
|
@ -265,9 +267,10 @@ func TestForceAcceptImportTx(t *testing.T) {
|
||||||
genesisBytes := BuildGenesisTest(t)
|
genesisBytes := BuildGenesisTest(t)
|
||||||
|
|
||||||
issuer := make(chan common.Message, 1)
|
issuer := make(chan common.Message, 1)
|
||||||
|
baseDB := memdb.New()
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, baseDB))
|
||||||
|
|
||||||
ctx := snow.DefaultContextTest()
|
ctx := snow.DefaultContextTest()
|
||||||
ctx.NetworkID = networkID
|
ctx.NetworkID = networkID
|
||||||
|
@ -285,7 +288,7 @@ func TestForceAcceptImportTx(t *testing.T) {
|
||||||
|
|
||||||
err := vm.Initialize(
|
err := vm.Initialize(
|
||||||
ctx,
|
ctx,
|
||||||
memdb.New(),
|
prefixdb.New([]byte{1}, baseDB),
|
||||||
genesisBytes,
|
genesisBytes,
|
||||||
issuer,
|
issuer,
|
||||||
[]*common.Fx{{
|
[]*common.Fx{{
|
||||||
|
|
|
@ -137,7 +137,7 @@ func defaultVM() *VM {
|
||||||
vm.validators.PutValidatorSet(DefaultSubnetID, defaultSubnet)
|
vm.validators.PutValidatorSet(DefaultSubnetID, defaultSubnet)
|
||||||
|
|
||||||
vm.clock.Set(defaultGenesisTime)
|
vm.clock.Set(defaultGenesisTime)
|
||||||
db := memdb.New()
|
db := prefixdb.New([]byte{0}, memdb.New())
|
||||||
msgChan := make(chan common.Message, 1)
|
msgChan := make(chan common.Message, 1)
|
||||||
ctx := defaultContext()
|
ctx := defaultContext()
|
||||||
ctx.Lock.Lock()
|
ctx.Lock.Lock()
|
||||||
|
@ -1189,7 +1189,7 @@ func TestAtomicImport(t *testing.T) {
|
||||||
key := keys[0]
|
key := keys[0]
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, vm.DB.GetDatabase()))
|
||||||
|
|
||||||
vm.Ctx.SharedMemory = sm.NewBlockchainSharedMemory(vm.Ctx.ChainID)
|
vm.Ctx.SharedMemory = sm.NewBlockchainSharedMemory(vm.Ctx.ChainID)
|
||||||
|
|
||||||
|
@ -1282,7 +1282,7 @@ func TestOptimisticAtomicImport(t *testing.T) {
|
||||||
key := keys[0]
|
key := keys[0]
|
||||||
|
|
||||||
sm := &atomic.SharedMemory{}
|
sm := &atomic.SharedMemory{}
|
||||||
sm.Initialize(logging.NoLog{}, memdb.New())
|
sm.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, vm.DB.GetDatabase()))
|
||||||
|
|
||||||
vm.Ctx.SharedMemory = sm.NewBlockchainSharedMemory(vm.Ctx.ChainID)
|
vm.Ctx.SharedMemory = sm.NewBlockchainSharedMemory(vm.Ctx.ChainID)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue