highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-07-04 20:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

nip13: parallel DoWork(), deprecate Generate()

Browse Source
This commit is contained in:
fiatjaf
2024-08-20 23:04:52 -03:00
parent 2da58356b0
commit 83bd196bae
2 changed files with 92 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
nip13/nip13_test.go
View File

@ -1,6 +1,7 @@
package nip13
import (
"context"
"errors"
"fmt"
"strconv"
@ -52,20 +53,20 @@ func TestCommittedDifficulty(t *testing.T) {
}
}
func TestGenerateShort(t *testing.T) {
event := &nostr.Event{
func TestDoWorkShort(t *testing.T) {
event := nostr.Event{
Kind: nostr.KindTextNote,
Content: "It's just me mining my own business",
PubKey: "a48380f4cfcc1ad5378294fcac36439770f9c878dd880ffa94bb74ea54a6f243",
}
pow, err := Generate(event, 0, 3*time.Second)
pow, err := DoWork(context.Background(), event, 0)
if err != nil {
t.Fatal(err)
}
testNonceTag(t, pow, 0)
}
func TestGenerateLong(t *testing.T) {
func TestDoWorkLong(t *testing.T) {
if testing.Short() {
t.Skip("too consuming for short mode")
}
@ -73,16 +74,18 @@ func TestGenerateLong(t *testing.T) {
difficulty := difficulty
t.Run(fmt.Sprintf("%dbits", difficulty), func(t *testing.T) {
t.Parallel()
event := &nostr.Event{
event := nostr.Event{
Kind: nostr.KindTextNote,
Content: "It's just me mining my own business",
PubKey: "a48380f4cfcc1ad5378294fcac36439770f9c878dd880ffa94bb74ea54a6f243",
}
pow, err := Generate(event, difficulty, time.Minute)
ctx, _ := context.WithTimeout(context.Background(), time.Minute)
pow, err := DoWork(ctx, event, difficulty)
if err != nil {
t.Fatal(err)
}
if err := Check(pow.GetID(), difficulty); err != nil {
event.Tags = append(event.Tags, pow)
if err := Check(event.GetID(), difficulty); err != nil {
t.Error(err)
}
testNonceTag(t, pow, difficulty)
@ -90,13 +93,8 @@ func TestGenerateLong(t *testing.T) {
}
}
func testNonceTag(t *testing.T, event *nostr.Event, commitment int) {
func testNonceTag(t *testing.T, tag nostr.Tag, commitment int) {
t.Helper()
tagptr := event.Tags.GetFirst([]string{"nonce"})
if tagptr == nil {
t.Fatal("no nonce tag")
}
tag := *tagptr
if tag[0] != "nonce" {
t.Errorf("tag[0] = %q; want 'nonce'", tag[0])
}
@ -108,42 +106,24 @@ func testNonceTag(t *testing.T, event *nostr.Event, commitment int) {
}
}
func TestGenerateTimeout(t *testing.T) {
event := &nostr.Event{
func TestDoWorkTimeout(t *testing.T) {
event := nostr.Event{
Kind: nostr.KindTextNote,
Content: "It's just me mining my own business",
PubKey: "a48380f4cfcc1ad5378294fcac36439770f9c878dd880ffa94bb74ea54a6f243",
}
done := make(chan error)
go func() {
_, err := Generate(event, 256, time.Millisecond)
ctx, _ := context.WithTimeout(context.Background(), time.Millisecond)
_, err := DoWork(ctx, event, 256)
done <- err
}()
select {
case <-time.After(time.Second):
t.Error("Generate took too long to timeout")
t.Error("DoWork took too long to timeout")
case err := <-done:
if !errors.Is(err, ErrGenerateTimeout) {
t.Errorf("Generate returned %v; want ErrGenerateTimeout", err)
}
}
}
func BenchmarkCheck(b *testing.B) {
for i := 0; i < b.N; i++ {
Check("000000000e9d97a1ab09fc381030b346cdd7a142ad57e6df0b46dc9bef6c7e2d", 36)
}
}
func BenchmarkGenerateOneIteration(b *testing.B) {
for i := 0; i < b.N; i++ {
event := &nostr.Event{
Kind: nostr.KindTextNote,
Content: "It's just me mining my own business",
PubKey: "a48380f4cfcc1ad5378294fcac36439770f9c878dd880ffa94bb74ea54a6f243",
}
if _, err := Generate(event, 0, time.Minute); err != nil {
b.Fatal(err)
t.Errorf("DoWork returned %v; want ErrDoWorkTimeout", err)
}
}
}
@ -168,3 +148,25 @@ func BenchmarkGenerate(b *testing.B) {
})
}
}
func BenchmarkDoWork(b *testing.B) {
if testing.Short() {
b.Skip("too consuming for short mode")
}
for _, difficulty := range []int{8, 16, 24} {
difficulty := difficulty
b.Run(fmt.Sprintf("%dbits", difficulty), func(b *testing.B) {
for i := 0; i < b.N; i++ {
event := &nostr.Event{
Kind: nostr.KindTextNote,
Content: "It's just me mining my own business",
PubKey: "a48380f4cfcc1ad5378294fcac36439770f9c878dd880ffa94bb74ea54a6f243",
}
ctx, _ := context.WithTimeout(context.Background(), time.Second*60)
if _, err := DoWork(ctx, *event, difficulty); err != nil {
b.Fatal(err)
}
}
})
}
}