Skip to content

Commit 14577e9

Browse files
committed
fully remove empty digest
1 parent 4e0d4a8 commit 14577e9

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

sched_test.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ import (
1818
"github.com/stretchr/testify/require"
1919
)
2020

21-
var emptyDigest = simplex.Digest{}
22-
2321
func TestDependencyTree(t *testing.T) {
2422
dt := simplex.NewDependencies()
2523

2624
for i := 0; i < 5; i++ {
2725
dt.Insert(simplex.Task{
2826
F: func() simplex.Digest {
2927
return simplex.Digest{uint8(i + 1)}
30-
}, ParentBlockDependency: simplex.Digest{uint8(i)},
28+
}, ParentBlockDependency: &simplex.Digest{uint8(i)},
3129
},
3230
)
3331
}
@@ -56,7 +54,7 @@ func TestSchedulerWithEmptyRoundDependencies(t *testing.T) {
5654
defer wg.Done()
5755
counter.Add(1)
5856
return dig2
59-
}, emptyDigest, []uint64{1})
57+
}, nil, []uint64{1})
6058

6159
require.Zero(t, counter.Load())
6260
as.ExecuteEmptyNotarizationDependents(1)
@@ -76,15 +74,15 @@ func TestSchedulerWithEmptyRoundDependencies(t *testing.T) {
7674
defer wg.Done()
7775
counter.Add(1)
7876
return makeDigest(t)
79-
}, emptyDigest, []uint64{1, 2, 3})
77+
}, nil, []uint64{1, 2, 3})
8078

8179
wg.Add(1)
8280
as.Schedule(func() simplex.Digest {
8381
defer wg.Done()
8482
counter.Add(2)
8583
ticks <- struct{}{}
8684
return makeDigest(t)
87-
}, emptyDigest, []uint64{1})
85+
}, nil, []uint64{1})
8886

8987
require.Zero(t, counter.Load())
9088
as.ExecuteEmptyNotarizationDependents(1)
@@ -112,7 +110,7 @@ func TestSchedulerWithEmptyRoundDependencies(t *testing.T) {
112110
defer wg.Done()
113111
counter.Add(1)
114112
return dig2
115-
}, dig1, []uint64{1})
113+
}, &dig1, []uint64{1})
116114

117115
require.Zero(t, counter.Load())
118116
as.ExecuteEmptyNotarizationDependents(1)
@@ -140,7 +138,7 @@ func TestSchedulerWithEmptyRoundDependencies(t *testing.T) {
140138
defer wg.Done()
141139
counter.Add(1)
142140
return dig2
143-
}, dig1, []uint64{1})
141+
}, &dig1, []uint64{1})
144142

145143
require.Zero(t, counter.Load())
146144

@@ -150,7 +148,7 @@ func TestSchedulerWithEmptyRoundDependencies(t *testing.T) {
150148
defer wg.Done()
151149
tasks <- struct{}{}
152150
return dig1
153-
}, emptyDigest, nil)
151+
}, nil, nil)
154152

155153
<-tasks
156154
require.Zero(t, counter.Load())
@@ -176,7 +174,7 @@ func TestAsyncScheduler(t *testing.T) {
176174
defer wg.Done()
177175
<-ticks
178176
return dig2
179-
}, emptyDigest, []uint64{})
177+
}, nil, []uint64{})
180178

181179
ticks <- struct{}{}
182180
wg.Wait()
@@ -193,7 +191,7 @@ func TestAsyncScheduler(t *testing.T) {
193191
as.Schedule(func() simplex.Digest {
194192
close(ticks)
195193
return dig2
196-
}, emptyDigest, []uint64{})
194+
}, nil, []uint64{})
197195

198196
ticks <- struct{}{}
199197
})
@@ -249,9 +247,9 @@ func scheduleTask(lock *sync.Mutex, finished map[simplex.Digest]struct{}, depend
249247
return id
250248
}
251249

252-
dep := emptyDigest
250+
var dep *simplex.Digest
253251
if !hasFinished {
254-
dep = dependency
252+
dep = &dependency
255253
}
256254

257255
as.Schedule(task, dep, []uint64{})

0 commit comments

Comments
 (0)