prog

core/exchange.go

@@ -47,7 +47,7 @@ func (ce *Exchange) GetRangeByHeight(
 	from *header.ExtendedHeader,
 	to uint64,
 ) ([]*header.ExtendedHeader, error) {
-	amount := to - from.Height()
+	amount := to - (from.Height() + 1)
 	headers, err := ce.getRangeByHeight(ctx, from.Height()+1, amount)
 	if err != nil {
 		return nil, err

core/exchange_test.go

@@ -36,12 +36,18 @@ func TestCoreExchange_RequestHeaders(t *testing.T) {
 	genHeader, err := ce.Get(ctx, genBlock.Header.Hash().Bytes())
 	require.NoError(t, err)
 
-	// request headers from height 1 to 10 (1:10]
-	headers, err := ce.GetRangeByHeight(context.Background(), genHeader, 10)
+	to := uint64(10)
+	expectedFirstHeightInRange := genHeader.Height() + 1
+	expectedLastHeightInRange := to - 1
+	expectedLenHeaders := to - expectedFirstHeightInRange
+
+	// request headers from height 1 to 10 [2:10)
+	headers, err := ce.GetRangeByHeight(context.Background(), genHeader, to)
 	require.NoError(t, err)
 
-	assert.Equal(t, 9, len(headers))
-	assert.Equal(t, uint64(10), headers[len(headers)-1].Height())
+	assert.Len(t, headers, int(expectedLenHeaders))
+	assert.Equal(t, expectedFirstHeightInRange, headers[0].Height())
+	assert.Equal(t, expectedLastHeightInRange, headers[len(headers)-1].Height())
 }
 
 func createCoreFetcher(t *testing.T, cfg *testnode.Config) (*BlockFetcher, testnode.Context) {

nodebuilder/header/service.go

@@ -57,7 +57,7 @@ func (s *Service) GetRangeByHeight(
 	from *header.ExtendedHeader,
 	to uint64,
 ) ([]*header.ExtendedHeader, error) {
-	return s.store.GetRange(ctx, from.Height()+1, to)
+	return s.store.GetRangeByHeight(ctx, from, to)
 }
 
 func (s *Service) GetByHeight(ctx context.Context, height uint64) (*header.ExtendedHeader, error) {