Skip to content

Commit 957302f

Browse files
authored
chore: remove finalnum inherent, clear babe slotToProof map (#1632)
1 parent 887f72c commit 957302f

File tree

7 files changed

+5
-25
lines changed

7 files changed

+5
-25
lines changed

dot/sync/test_helpers.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ func BuildBlock(t *testing.T, instance runtime.Instance, parent *types.Header, e
163163
err = idata.SetInt64Inherent(types.Babeslot, 1)
164164
require.NoError(t, err)
165165

166-
err = idata.SetBigIntInherent(types.Finalnum, big.NewInt(0))
167-
require.NoError(t, err)
168-
169166
ienc, err := idata.Encode()
170167
require.NoError(t, err)
171168

dot/types/babe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type BabeConfiguration struct {
3131
C1 uint64 // (1-(c1/c2)) is the probability of a slot being empty
3232
C2 uint64
3333
GenesisAuthorities []*AuthorityRaw
34-
Randomness [32]byte
34+
Randomness [RandomnessLength]byte
3535
SecondarySlots byte
3636
}
3737

dot/types/inherents.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
var (
3131
Timstap0 = []byte("timstap0")
3232
Babeslot = []byte("babeslot")
33-
Finalnum = []byte("finalnum")
3433
Uncles00 = []byte("uncles00")
3534
)
3635

lib/babe/build.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ func (b *BlockBuilder) buildBlock(parent *types.Header, slot Slot) (*types.Block
134134

135135
logger.Trace("finalised block")
136136

137-
header.ParentHash = parent.Hash()
138-
header.Number.Add(parent.Number, big.NewInt(1))
139-
140137
// create seal and add to digest
141138
seal, err := b.buildBlockSeal(header)
142139
if err != nil {
@@ -275,17 +272,6 @@ func (b *BlockBuilder) buildBlockInherents(slot Slot) ([][]byte, error) {
275272
return nil, err
276273
}
277274

278-
// add finalnum
279-
fin, err := b.blockState.GetFinalizedHeader(0, 0)
280-
if err != nil {
281-
return nil, err
282-
}
283-
284-
err = idata.SetBigIntInherent(types.Finalnum, fin.Number)
285-
if err != nil {
286-
return nil, err
287-
}
288-
289275
ienc, err := idata.Encode()
290276
if err != nil {
291277
return nil, err

lib/babe/epoch.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ func (b *Service) initiateEpoch(epoch uint64) error {
113113
logger.Debug("initiating epoch", "epoch", epoch, "start slot", startSlot)
114114

115115
for i := startSlot; i < startSlot+b.epochLength; i++ {
116+
if epoch > 0 {
117+
delete(b.slotToProof, i-b.epochLength) // clear data from previous epoch
118+
}
119+
116120
b.slotToProof[i], err = b.runLottery(i, epoch)
117121
if err != nil {
118122
return fmt.Errorf("error running slot lottery at slot %d: error %s", i, err)

lib/runtime/life/exports_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ func buildBlock(t *testing.T, instance runtime.Instance) *types.Block {
137137
err = idata.SetInt64Inherent(types.Babeslot, 1)
138138
require.NoError(t, err)
139139

140-
err = idata.SetBigIntInherent(types.Finalnum, big.NewInt(0))
141-
require.NoError(t, err)
142-
143140
ienc, err := idata.Encode()
144141
require.NoError(t, err)
145142

lib/runtime/wasmer/exports_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,6 @@ func buildBlock(t *testing.T, instance runtime.Instance) *types.Block {
386386
err = idata.SetInt64Inherent(types.Babeslot, 1)
387387
require.NoError(t, err)
388388

389-
err = idata.SetBigIntInherent(types.Finalnum, big.NewInt(0))
390-
require.NoError(t, err)
391-
392389
ienc, err := idata.Encode()
393390
require.NoError(t, err)
394391

0 commit comments

Comments
 (0)