Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indicate the current index when waiting to reach tip for check:construction #370

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Indicate the current index when waiting to reach tip for check:construction #370

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2453b38
message now indicate current index when waiting for it to reach the tip
rllola Oct 13, 2022
6ebf800
return block index instead of 0 when we have reached for the tip
rllola Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/tester/construction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,22 +368,22 @@ func (t *ConstructionTester) StartPeriodicLogger(
}
}

func (t *ConstructionTester) checkTip(ctx context.Context) (int64, error) {
func (t *ConstructionTester) checkTip(ctx context.Context) (int64, int64, error) {
atTip, blockIdentifier, err := utils.CheckNetworkTip(
ctx,
t.network,
t.config.TipDelay,
t.onlineFetcher,
)
if err != nil {
return -1, fmt.Errorf("failed to check network tip: %w", err)
return -1, 0, fmt.Errorf("failed to check network tip: %w", err)
}

if atTip {
return blockIdentifier.Index, nil
return blockIdentifier.Index, 0, nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line be return blockIdentifier.Index, blockIdentifier.Index, nil? If the chain is at tip, I think it makes more sense the current index == tip index instead of current index == 0

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that work too.

}

return -1, nil
return -1, blockIdentifier.Index, nil
}

// waitForTip loops until the Rosetta implementation is at tip.
Expand All @@ -393,7 +393,7 @@ func (t *ConstructionTester) waitForTip(ctx context.Context) (int64, error) {

for {
// Don't wait any time before first tick if at tip.
tipIndex, err := t.checkTip(ctx)
tipIndex, currentIndex, err := t.checkTip(ctx)
if err != nil {
return -1, fmt.Errorf("failed to check tip: %w", err)
}
Expand All @@ -402,7 +402,7 @@ func (t *ConstructionTester) waitForTip(ctx context.Context) (int64, error) {
return tipIndex, nil
}

log.Println("waiting for implementation to reach tip before testing...")
log.Printf("waiting for implementation to reach tip before testing... (current index: %d, tip delay: %d)\n", currentIndex, t.config.TipDelay)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am thinking if we want to show the current sync status and progress, other than tip delay probably we can also add current block timestamp so that we know how far are we from the tip

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I am not mistaken BlockIdentifier only has the hash and the index. We don't have the timestamp info to show, do we ?


select {
case <-ctx.Done():
Expand Down