Skip to content

M
mybee
Commit d4fcf466 authored by Ralph Pichler's avatar Ralph Pichler Committed by GitHub
Browse files
Options

fix: postage sync update events (#1778)

parent 88c0a195
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 50 deletions
pkg/postage/batchservice/batchservice.go
View file @ d4fcf466
......@@ -96,6 +96,9 @@ func (svc *batchService) UpdatePrice(price *big.Int) error {
func (svc *batchService) UpdateBlockNumber(blockNumber uint64) error {
cs := svc.storer.GetChainState()
if blockNumber == cs.Block {
return nil
}
diff := big.NewInt(0).SetUint64(blockNumber - cs.Block)
cs.TotalAmount.Add(cs.TotalAmount, diff.Mul(diff, cs.CurrentPrice))
......
pkg/postage/listener/listener.go
View file @ d4fcf466
......@@ -200,16 +200,11 @@ func (l *listener) Listen(from uint64, updater postage.EventUpdater) <-chan stru
return err
}
// this is called before processing the events
// so that the eviction in batchstore gets the correct
// block height context for the gc round. otherwise
// expired batches might be "revived".
err = updater.UpdateBlockNumber(to)
for _, e := range events {
err = updater.UpdateBlockNumber(e.BlockNumber)
if err != nil {
return err
}
for _, e := range events {
if err = l.processEvent(e, updater); err != nil {
return err
}
......
pkg/postage/listener/listener_test.go
View file @ d4fcf466
......@@ -27,6 +27,7 @@ var priceOracleAddress common.Address = common.HexToAddress("eeef")
func TestListener(t *testing.T) {
logger := logging.New(ioutil.Discard, 0)
blockNumber := uint64(500)
timeout := 5 * time.Second
// test that when the listener gets a certain event
// then we would like to assert the appropriate EventUpdater method was called
......@@ -42,17 +43,17 @@ func TestListener(t *testing.T) {
ev, evC := newEventUpdaterMock()
mf := newMockFilterer(
WithFilterLogEvents(
c.toLog(),
c.toLog(496),
),
)
listener := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
listener.Listen(0, ev)
l := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
l.Listen(0, ev)
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 0) // event args should be equal
e.(blockNumberCall).compare(t, blockNumber-uint64(listener.TailSize)) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
t.Fatal("timed out waiting for block number update")
}
select {
......@@ -73,17 +74,17 @@ func TestListener(t *testing.T) {
ev, evC := newEventUpdaterMock()
mf := newMockFilterer(
WithFilterLogEvents(
topup.toLog(),
topup.toLog(496),
),
)
listener := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
listener.Listen(0, ev)
l := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
l.Listen(0, ev)
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 0) // event args should be equal
e.(blockNumberCall).compare(t, blockNumber-uint64(listener.TailSize)) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
t.Fatal("timed out waiting for block number update")
}
select {
......@@ -104,17 +105,17 @@ func TestListener(t *testing.T) {
ev, evC := newEventUpdaterMock()
mf := newMockFilterer(
WithFilterLogEvents(
depthIncrease.toLog(),
depthIncrease.toLog(496),
),
)
listener := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
listener.Listen(0, ev)
l := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
l.Listen(0, ev)
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 0) // event args should be equal
e.(blockNumberCall).compare(t, blockNumber-uint64(listener.TailSize)) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
t.Fatal("timed out waiting for block number update")
}
select {
......@@ -133,17 +134,16 @@ func TestListener(t *testing.T) {
ev, evC := newEventUpdaterMock()
mf := newMockFilterer(
WithFilterLogEvents(
priceUpdate.toLog(),
priceUpdate.toLog(496),
),
)
listener := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
listener.Listen(0, ev)
l := listener.New(logger, mf, postageStampAddress, priceOracleAddress, 1)
l.Listen(0, ev)
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 0) // event args should be equal
e.(blockNumberCall).compare(t, blockNumber-uint64(listener.TailSize)) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
t.Fatal("timed out waiting for block number update")
}
select {
......@@ -179,15 +179,13 @@ func TestListener(t *testing.T) {
price: big.NewInt(500),
}
blockNumber := uint64(500)
ev, evC := newEventUpdaterMock()
mf := newMockFilterer(
WithFilterLogEvents(
c.toLog(),
topup.toLog(),
depthIncrease.toLog(),
priceUpdate.toLog(),
c.toLog(495),
topup.toLog(496),
depthIncrease.toLog(497),
priceUpdate.toLog(498),
),
WithBlockNumber(blockNumber),
)
......@@ -196,7 +194,7 @@ func TestListener(t *testing.T) {
select {
case e := <-evC:
e.(blockNumberCall).compare(t, blockNumber-uint64(listener.TailSize)) // event args should be equal
e.(blockNumberCall).compare(t, 495) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for block number update")
}
......@@ -207,13 +205,24 @@ func TestListener(t *testing.T) {
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
}
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 496) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for block number update")
}
select {
case e := <-evC:
e.(topupArgs).compare(t, topup) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
}
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 497) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for block number update")
}
select {
case e := <-evC:
......@@ -221,6 +230,12 @@ func TestListener(t *testing.T) {
case <-time.After(timeout):
t.Fatal("timed out waiting for event")
}
select {
case e := <-evC:
e.(blockNumberCall).compare(t, 498) // event args should be equal
case <-time.After(timeout):
t.Fatal("timed out waiting for block number update")
}
select {
case e := <-evC:
......@@ -367,13 +382,14 @@ func (c createArgs) compare(t *testing.T, want createArgs) {
}
}
func (c createArgs) toLog() types.Log {
func (c createArgs) toLog(blockNumber uint64) types.Log {
b, err := listener.PostageStampABI.Events["BatchCreated"].Inputs.NonIndexed().Pack(c.amount, c.normalisedAmount, common.BytesToAddress(c.owner), c.depth)
if err != nil {
panic(err)
}
return types.Log{
Data: b,
BlockNumber: blockNumber,
Topics: []common.Hash{listener.BatchCreatedTopic, common.BytesToHash(c.id)}, // 1st item is the function sig digest, 2nd is always the batch id
}
}
......@@ -394,13 +410,14 @@ func (ta topupArgs) compare(t *testing.T, want topupArgs) {
}
}
func (ta topupArgs) toLog() types.Log {
func (ta topupArgs) toLog(blockNumber uint64) types.Log {
b, err := listener.PostageStampABI.Events["BatchTopUp"].Inputs.NonIndexed().Pack(ta.amount, ta.normalisedBalance)
if err != nil {
panic(err)
}
return types.Log{
Data: b,
BlockNumber: blockNumber,
Topics: []common.Hash{listener.BatchTopupTopic, common.BytesToHash(ta.id)}, // 1st item is the function sig digest, 2nd is always the batch id
}
}
......@@ -424,13 +441,14 @@ func (d depthArgs) compare(t *testing.T, want depthArgs) {
}
}
func (d depthArgs) toLog() types.Log {
func (d depthArgs) toLog(blockNumber uint64) types.Log {
b, err := listener.PostageStampABI.Events["BatchDepthIncrease"].Inputs.NonIndexed().Pack(d.depth, d.normalisedBalance)
if err != nil {
panic(err)
}
return types.Log{
Data: b,
BlockNumber: blockNumber,
Topics: []common.Hash{listener.BatchDepthIncreaseTopic, common.BytesToHash(d.id)}, // 1st item is the function sig digest, 2nd is always the batch id
}
}
......@@ -446,13 +464,14 @@ func (p priceArgs) compare(t *testing.T, want priceArgs) {
}
}
func (p priceArgs) toLog() types.Log {
func (p priceArgs) toLog(blockNumber uint64) types.Log {
b, err := listener.PriceOracleABI.Events["PriceUpdate"].Inputs.NonIndexed().Pack(p.price)
if err != nil {
panic(err)
}
return types.Log{
Data: b,
BlockNumber: blockNumber,
Topics: []common.Hash{listener.PriceUpdateTopic},
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment