localhost and 127.0.0.1 are "virtual" relays, but not when running go test

This commit is contained in:
fiatjaf
2025-03-10 02:49:08 -03:00
parent 7e04bbb4b8
commit 8d869009b0
2 changed files with 9 additions and 4 deletions

View File

@@ -67,7 +67,7 @@ func (sys *System) StreamLiveFeed(
}
go func() {
sub := sys.Pool.SubMany(ctx, relays, nostr.Filters{filter}, nostr.WithLabel("livefeed"))
sub := sys.Pool.SubscribeMany(ctx, relays, filter, nostr.WithLabel("livefeed"))
for evt := range sub {
sys.StoreRelay.Publish(ctx, *evt.Event)
if latest < evt.CreatedAt {
@@ -153,7 +153,7 @@ func (sys *System) FetchFeedPage(
fUntil := oldestTimestamp + 1
filter.Until = &fUntil
filter.Since = nil
for ie := range sys.Pool.SubManyEose(ctx, relays, nostr.Filters{filter}, nostr.WithLabel("feedpage")) {
for ie := range sys.Pool.FetchMany(ctx, relays, filter, nostr.WithLabel("feedpage")) {
sys.StoreRelay.Publish(ctx, *ie.Event)
// we shouldn't need this check here, but against rogue relays we'll do it

View File

@@ -4,6 +4,7 @@ import (
"math"
"strings"
"sync"
"testing"
"time"
)
@@ -21,12 +22,16 @@ func IsVirtualRelay(url string) bool {
if strings.HasPrefix(url, "wss://feeds.nostr.band") ||
strings.HasPrefix(url, "wss://filter.nostr.wine") ||
strings.HasPrefix(url, "ws://localhost") ||
strings.HasPrefix(url, "ws://127.0.0.1") ||
strings.HasPrefix(url, "wss://cache") {
return true
}
if !testing.Testing() &&
strings.HasPrefix(url, "ws://localhost") ||
strings.HasPrefix(url, "ws://127.0.0.1") {
return true
}
return false
}