Skip to content

Commit

Permalink
Bump go-spacemesh to 1.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@kacpersaw
kacpersaw committed Aug 3, 2023
1 parent bedfd33 commit d179229
Show file tree
Hide file tree
Showing 14 changed files with 104 additions and 100 deletions.
7 changes: 4 additions & 3 deletions collector/global.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package collector
import (
"context"
"errors"
"fmt"
"io"
"time"

Expand All @@ -19,7 +20,7 @@ func (c *Collector) GetAccountState(address string) (uint64, uint64, error) {

res, err := c.globalClient.Account(ctx, req)
if err != nil {
log.Error("cannot get account info: %v", err)
log.Err(fmt.Errorf("cannot get account info: %v", err))
return 0, 0, err
}

Expand All @@ -45,7 +46,7 @@ func (c *Collector) globalStatePump() error {

stream, err := c.globalClient.GlobalStateStream(context.Background(), &req)
if err != nil {
log.Error("cannot get global state account stream: %v", err)
log.Err(fmt.Errorf("cannot get global state account stream: %v", err))
return err
}

Expand All @@ -55,7 +56,7 @@ func (c *Collector) globalStatePump() error {
return err
}
if err != nil {
log.Error("cannot receive Global state data: %v", err)
log.Err(fmt.Errorf("cannot receive Global state data: %v", err))
return err
}
item := response.GetDatum()
Expand Down
21 changes: 11 additions & 10 deletions collector/mesh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package collector

import (
"context"
"fmt"
"github.com/spacemeshos/explorer-backend/utils"
"io"
"time"
Expand All @@ -18,42 +19,42 @@ func (c *Collector) getNetworkInfo() error {

genesisTime, err := c.meshClient.GenesisTime(ctx, &pb.GenesisTimeRequest{})
if err != nil {
log.Error("cannot get GenesisTime: %v", err)
log.Err(fmt.Errorf("cannot get GenesisTime: %v", err))
return err
}

genesisId, err := c.meshClient.GenesisID(ctx, &pb.GenesisIDRequest{})
if err != nil {
log.Error("cannot get NetId: %v", err)
log.Err(fmt.Errorf("cannot get NetId: %v", err))
}

epochNumLayers, err := c.meshClient.EpochNumLayers(ctx, &pb.EpochNumLayersRequest{})
if err != nil {
log.Error("cannot get EpochNumLayers: %v", err)
log.Err(fmt.Errorf("cannot get EpochNumLayers: %v", err))
return err
}

maxTransactionsPerSecond, err := c.meshClient.MaxTransactionsPerSecond(ctx, &pb.MaxTransactionsPerSecondRequest{})
if err != nil {
log.Error("cannot get MaxTransactionsPerSecond: %v", err)
log.Err(fmt.Errorf("cannot get MaxTransactionsPerSecond: %v", err))
return err
}

layerDuration, err := c.meshClient.LayerDuration(ctx, &pb.LayerDurationRequest{})
if err != nil {
log.Error("cannot get LayerDuration: %v", err)
log.Err(fmt.Errorf("cannot get LayerDuration: %v", err))
return err
}

accounts, err := c.debugClient.Accounts(ctx, &pb.AccountsRequest{})
if err != nil {
log.Error("cannot get accounts: %v", err)
log.Err(fmt.Errorf("cannot get accounts: %v", err))
return err
}

res, err := c.smesherClient.PostConfig(ctx, &empty.Empty{})
if err != nil {
log.Error("cannot get POST config: %v", err)
log.Err(fmt.Errorf("cannot get POST config: %v", err))
return err
}

Expand Down Expand Up @@ -86,7 +87,7 @@ func (c *Collector) layersPump() error {

stream, err := c.meshClient.LayerStream(context.Background(), &req)
if err != nil {
log.Error("cannot get layer stream: %v", err)
log.Err(fmt.Errorf("cannot get layer stream: %v", err))
return err
}

Expand All @@ -96,7 +97,7 @@ func (c *Collector) layersPump() error {
return err
}
if err != nil {
log.Error("cannot receive layer: %v", err)
log.Err(fmt.Errorf("cannot receive layer: %v", err))
return err
}
layer := response.GetLayer()
Expand All @@ -107,7 +108,7 @@ func (c *Collector) layersPump() error {
func (c *Collector) syncMissingLayers() error {
status, err := c.nodeClient.Status(context.Background(), &pb.StatusRequest{})
if err != nil {
log.Error("cannot receive node status: %v", err)
log.Err(fmt.Errorf("cannot receive node status: %v", err))
return err
}
syncedLayerNum := status.Status.SyncedLayer.Number
Expand Down
5 changes: 3 additions & 2 deletions collector/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package collector

import (
"context"
"fmt"
pb "github.com/spacemeshos/api/release/go/spacemesh/v1"
"io"

Expand All @@ -21,7 +22,7 @@ func (c *Collector) syncStatusPump() error {

stream, err := c.nodeClient.StatusStream(context.Background(), &req)
if err != nil {
log.Error("cannot get sync status stream: %v", err)
log.Err(fmt.Errorf("cannot get sync status stream: %v", err))
return err
}

Expand All @@ -32,7 +33,7 @@ func (c *Collector) syncStatusPump() error {
return err
}
if err != nil {
log.Error("cannot receive sync status: %v", err)
log.Err(fmt.Errorf("cannot receive sync status: %v", err))
return err
}

Expand Down
33 changes: 16 additions & 17 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ require (
github.com/labstack/echo/v4 v4.9.1
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/spacemeshos/address v0.0.0-20220829090052-44ab32617871
github.com/spacemeshos/api/release/go v1.16.0
github.com/spacemeshos/api/release/go v1.17.0
github.com/spacemeshos/go-scale v1.1.10
github.com/spacemeshos/go-spacemesh v0.3.12-beta.0
github.com/spacemeshos/go-spacemesh v1.0.8
github.com/stretchr/testify v1.8.4
github.com/urfave/cli/v2 v2.23.7
go.mongodb.org/mongo-driver v1.10.1
golang.org/x/net v0.10.0
golang.org/x/net v0.12.0
golang.org/x/sync v0.3.0
google.golang.org/grpc v1.56.2
google.golang.org/grpc v1.57.0
)

require (
Expand All @@ -34,12 +34,12 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/klauspost/compress v1.16.4 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
Expand All @@ -57,8 +57,8 @@ require (
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
github.com/spacemeshos/merkle-tree v0.2.2 // indirect
github.com/spacemeshos/poet v0.8.6 // indirect
github.com/spacemeshos/post v0.8.4 // indirect
github.com/spacemeshos/poet v0.8.7 // indirect
github.com/spacemeshos/post v0.8.11 // indirect
github.com/spacemeshos/sha256-simd v0.1.0 // indirect
github.com/tinylib/msgp v1.1.8 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
Expand All @@ -71,16 +71,15 @@ require (
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit d179229

Please sign in to comment.