Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
n8maninger committed Jun 10, 2024
1 parent df07ba2 commit 74cf769
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/explored/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func newNode(addr, dir string, chainNetwork string, useUPNP bool, logger *zap.Lo
}
cm := chain.NewManager(dbstore, tipState)

store, err := sqlite.OpenDatabase(filepath.Join(dir, "./explore.db"), logger)
store, err := sqlite.OpenDatabase(filepath.Join(dir, "explored.sqlite3"), logger)
if err != nil {
return nil, err
}
Expand Down
11 changes: 7 additions & 4 deletions internal/syncerutil/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type EphemeralPeerStore struct {
mu sync.Mutex
}

func (eps *EphemeralPeerStore) banned(peer string) bool {
func (eps *EphemeralPeerStore) isBanned(peer string) bool {
host, _, err := net.SplitHostPort(peer)
if err != nil {
return false // shouldn't happen
Expand Down Expand Up @@ -62,7 +62,7 @@ func (eps *EphemeralPeerStore) Peers() ([]syncer.PeerInfo, error) {
defer eps.mu.Unlock()
var peers []syncer.PeerInfo
for addr, p := range eps.peers {
if !eps.banned(addr) {
if !eps.isBanned(addr) {
peers = append(peers, p)
}
}
Expand Down Expand Up @@ -109,7 +109,7 @@ func (eps *EphemeralPeerStore) Ban(peer string, duration time.Duration, reason s
func (eps *EphemeralPeerStore) Banned(peer string) (bool, error) {
eps.mu.Lock()
defer eps.mu.Unlock()
return eps.banned(peer), nil
return eps.isBanned(peer), nil
}

// NewEphemeralPeerStore initializes an EphemeralPeerStore.
Expand Down Expand Up @@ -205,5 +205,8 @@ func NewJSONPeerStore(path string) (*JSONPeerStore, error) {
EphemeralPeerStore: NewEphemeralPeerStore(),
path: path,
}
return jps, jps.load()
if err := jps.load(); err != nil {
return nil, err
}
return jps, nil
}
4 changes: 2 additions & 2 deletions persist/sqlite/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ func doTransaction(db *sql.DB, log *zap.Logger, fn func(tx *txn) error) error {
Tx: tx,
log: log,
}
if err = fn(ltx); err != nil {
if err := fn(ltx); err != nil {
return err
} else if err = tx.Commit(); err != nil {
} else if err := tx.Commit(); err != nil {
return fmt.Errorf("failed to commit transaction: %w", err)
}
return nil
Expand Down

0 comments on commit 74cf769

Please sign in to comment.