Skip to content

Commit 197bd8b

Browse files
committed
Fix lint issue
1 parent adba027 commit 197bd8b

11 files changed

Lines changed: 69 additions & 43 deletions

File tree

cmd/mpcium/main.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ func runNode(ctx context.Context, c *cli.Command) error {
181181
signingConsumer := eventconsumer.NewSigningConsumer(natsConn, signingStream, pubsub, peerRegistry)
182182

183183
// Make the node ready before starting the signing consumer
184-
peerRegistry.Ready()
184+
if err := peerRegistry.Ready(); err != nil {
185+
logger.Error("Failed to mark peer registry as ready", err)
186+
}
185187

186188
appContext, cancel := context.WithCancel(context.Background())
187189
// Setup signal handling to cancel context on termination signals.
@@ -247,7 +249,9 @@ func promptForSensitiveCredentials() {
247249
// Prompt for initiator public key (using regular input since it's not as sensitive)
248250
var initiatorKey string
249251
fmt.Print("Enter event initiator public key (hex): ")
250-
fmt.Scanln(&initiatorKey)
252+
if _, err := fmt.Scanln(&initiatorKey); err != nil {
253+
logger.Fatal("Failed to read initiator key", err)
254+
}
251255

252256
if initiatorKey == "" {
253257
logger.Fatal("Initiator public key cannot be empty", nil)

e2e/config.test.yaml.template

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
badger_password: "{{.BadgerPassword}}"
2+
consul:
3+
address: localhost:8501
4+
db_path: ./test_db
5+
environment: development
6+
event_initiator_pubkey: "{{.EventInitiatorPubkey}}"
7+
max_concurrent_keygen: 1
8+
mpc_threshold: 2
9+
mpcium_version: 1.0.0
10+
nats:
11+
url: nats://localhost:4223

e2e/keygen_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ func waitForConsulReady(address string, timeout time.Duration) error {
132132
for time.Now().Before(deadline) {
133133
resp, err := http.Get(fmt.Sprintf("http://%s/v1/status/leader", address))
134134
if err == nil && resp.StatusCode == http.StatusOK {
135-
resp.Body.Close()
135+
if err := resp.Body.Close(); err != nil {
136+
// Log the error but don't fail the check since the main goal is achieved
137+
fmt.Printf("Warning: failed to close response body: %v\n", err)
138+
}
136139
return nil
137140
}
138141
time.Sleep(1 * time.Second)
@@ -590,7 +593,9 @@ func (s *E2ETestSuite) checkKeyInAllNodes(t *testing.T, walletID, keyType, keyNa
590593
}
591594

592595
// Close recovery DB and try read-only again
593-
recoveryDB.Close()
596+
if err := recoveryDB.Close(); err != nil {
597+
t.Logf("Warning: failed to close recovery database for %s: %v", nodeName, err)
598+
}
594599
time.Sleep(1 * time.Second)
595600

596601
db, err = badger.Open(opts)
@@ -644,7 +649,9 @@ func (s *E2ETestSuite) checkKeyInAllNodes(t *testing.T, walletID, keyType, keyNa
644649
assert.NoError(t, err, "Failed to get %s key for wallet %s from node %s", keyName, walletID, nodeName)
645650
assert.NotEmpty(t, data, "Missing %s key for wallet %s in node %s", keyName, walletID, nodeName)
646651

647-
kvStore.Close()
652+
if err := kvStore.Close(); err != nil {
653+
t.Logf("Warning: failed to close kvStore for %s: %v", nodeName, err)
654+
}
648655
}
649656
}
650657

pkg/eventconsumer/event_consumer.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -721,14 +721,6 @@ func (ec *eventConsumer) addSession(walletID, txID string) {
721721
ec.sessionsLock.Unlock()
722722
}
723723

724-
// Remove a session from tracking
725-
func (ec *eventConsumer) removeSession(walletID, txID string) {
726-
sessionID := fmt.Sprintf("%s-%s", walletID, txID)
727-
ec.sessionsLock.Lock()
728-
delete(ec.activeSessions, sessionID)
729-
ec.sessionsLock.Unlock()
730-
}
731-
732724
// checkAndTrackSession checks if a session already exists and tracks it if new.
733725
// Returns true if the session is a duplicate.
734726
func (ec *eventConsumer) checkDuplicateSession(walletID, txID string) bool {

pkg/identity/identity.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"crypto/ed25519"
55
"encoding/hex"
66
"encoding/json"
7+
"errors"
78
"fmt"
89
"io"
910
"os"
@@ -252,8 +253,8 @@ func (s *fileStore) VerifyInitiatorMessage(msg types.InitiatorMessage) error {
252253

253254
// Get the signature
254255
signature := msg.Sig()
255-
if signature == nil || len(signature) == 0 {
256-
return fmt.Errorf("message has no signature")
256+
if len(signature) == 0 {
257+
return errors.New("signature is empty")
257258
}
258259

259260
// Verify the signature using the initiator's public key

pkg/logger/logger_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,9 @@ func TestInfof_FormattedMessage(t *testing.T) {
134134
}
135135

136136
func TestError_PanicsOnOddKeyValues(t *testing.T) {
137-
// Capture log output
138-
var buf bytes.Buffer
139-
Log = zerolog.New(&buf).With().Timestamp().Logger()
137+
Init("test", false)
140138

141139
assert.Panics(t, func() {
142-
Error("test error", nil, "odd_key") // odd number of key-value pairs
140+
Error("test error", nil, "odd_key", "value", "another_odd_key") //nolint:staticcheck // intentionally testing odd number of key-value pairs
143141
})
144-
}
142+
}

pkg/messaging/message_queue.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,16 @@ func (mq *msgQueue) Dequeue(topic string, handler func(message []byte) error) er
130130
if err != nil {
131131
if errors.Is(err, ErrPermament) {
132132
logger.Info("Permanent error on message", "meta", meta)
133-
msg.Term()
133+
if err := msg.Term(); err != nil {
134+
logger.Error("Failed to terminate message", err)
135+
}
134136
return
135137
}
136138

137139
logger.Error("Error handling message: ", err)
138-
msg.Nak()
140+
if err := msg.Nak(); err != nil {
141+
logger.Error("Failed to nak message", err)
142+
}
139143
return
140144
}
141145

@@ -155,7 +159,3 @@ func (mq *msgQueue) Close() {
155159
mq.consumerContext.Stop()
156160
}
157161
}
158-
159-
func (n *msgQueue) handleReconnect(nc *nats.Conn) {
160-
logger.Info("NATS: Reconnected to NATS")
161-
}

pkg/messaging/point2point.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ func (d *natsDirectMessaging) Send(id string, message []byte) error {
4747
func (d *natsDirectMessaging) Listen(id string, handler func(data []byte)) (Subscription, error) {
4848
sub, err := d.natsConn.Subscribe(id, func(m *nats.Msg) {
4949
handler(m.Data)
50-
m.Respond([]byte("OK"))
50+
if err := m.Respond([]byte("OK")); err != nil {
51+
logger.Error("Failed to respond to message", err)
52+
}
5153
})
5254
if err != nil {
5355
return nil, err

pkg/types/initiator_msg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type KeyType string
66

77
const (
88
KeyTypeSecp256k1 KeyType = "secp256k1"
9-
KeyTypeEd25519 = "ed25519"
9+
KeyTypeEd25519 KeyType = "ed25519"
1010
)
1111

1212
// InitiatorMessage is anything that carries a payload to verify and its signature.

scripts/migration/add-key-type/main.go

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,42 @@ func main() {
2727
logger.Fatal("Failed to create badger kv store", err)
2828
}
2929

30-
err = badgerKv.DB.View(func(txn *badger.Txn) error {
30+
if err := badgerKv.DB.View(func(txn *badger.Txn) error {
3131
opts := badger.DefaultIteratorOptions
32-
opts.PrefetchValues = false
32+
opts.PrefetchSize = 10
3333
it := txn.NewIterator(opts)
3434
defer it.Close()
3535

3636
for it.Rewind(); it.Valid(); it.Next() {
3737
item := it.Item()
3838
key := item.Key()
3939
var result []byte
40-
item.Value(func(val []byte) error {
41-
result = append([]byte{}, val...)
40+
41+
if err := item.Value(func(val []byte) error {
42+
result = append(result, val...)
4243
return nil
43-
})
44+
}); err != nil {
45+
return err
46+
}
4447

4548
if !strings.HasPrefix(string(key), "eddsa:") {
4649
if !strings.HasPrefix(string(key), "ecdsa:") {
47-
badgerKv.DB.Update(func(txn *badger.Txn) error {
48-
txn.Set([]byte(fmt.Sprintf("ecdsa:%s", key)), result)
49-
txn.Delete(key)
50-
return nil
51-
})
50+
if err := badgerKv.DB.Update(func(txn *badger.Txn) error {
51+
if err := txn.Set([]byte(fmt.Sprintf("ecdsa:%s", key)), result); err != nil {
52+
return err
53+
}
54+
return txn.Delete(key)
55+
}); err != nil {
56+
return err
57+
}
5258
}
53-
5459
}
5560
}
5661
return nil
57-
})
62+
}); err != nil {
63+
logger.Fatal("Failed to migrate keys", err)
64+
}
65+
5866
keys, err := badgerKv.Keys()
5967
if err != nil {
6068
logger.Fatal("Failed to get keys from badger kv store", err)

0 commit comments

Comments
 (0)