Skip to content

Commit

Permalink
Fixed SenML dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
kostasbalampekos committed Nov 2, 2023
1 parent 142a98d commit ff73368
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 192 deletions.
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ require (
github.com/hashicorp/vault/api v1.0.4
github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e
github.com/influxdata/influxdb v1.8.1
github.com/insighio/senml v1.1.7 // indirect
github.com/insighio/senml v1.2.0
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.7.0
github.com/mainflux/mproxy v0.2.2
github.com/mainflux/senml v1.5.0
github.com/mitchellh/mapstructure v1.1.2
github.com/nats-io/nats.go v1.10.0
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
Expand All @@ -41,7 +40,7 @@ require (
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.6.1
github.com/subosito/gotenv v1.2.0
github.com/uber/jaeger-client-go v2.24.0+incompatible
go.mongodb.org/mongo-driver v1.3.5
Expand Down
165 changes: 2 additions & 163 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/transformers/senml/transformer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"fmt"
"testing"

mfsenml "github.com/insighio/senml"
"github.com/mainflux/mainflux/pkg/errors"
"github.com/mainflux/mainflux/pkg/messaging"
"github.com/mainflux/mainflux/pkg/transformers/senml"
mfsenml "github.com/mainflux/senml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion twins/api/http/endpoint_states_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"net/http"
"testing"

"github.com/insighio/senml"
"github.com/mainflux/mainflux/twins"
"github.com/mainflux/senml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion twins/mocks/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"strconv"
"time"

"github.com/insighio/senml"
"github.com/mainflux/mainflux/pkg/messaging"
"github.com/mainflux/mainflux/pkg/uuid"
"github.com/mainflux/mainflux/twins"
"github.com/mainflux/senml"
)

const publisher = "twins"
Expand Down
2 changes: 1 addition & 1 deletion twins/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/mainflux/mainflux/pkg/errors"
"github.com/mainflux/mainflux/pkg/messaging"

"github.com/insighio/senml"
"github.com/mainflux/mainflux"
"github.com/mainflux/senml"
)

const publisher = "twins"
Expand Down
2 changes: 1 addition & 1 deletion twins/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"
"testing"

"github.com/insighio/senml"
"github.com/mainflux/mainflux/twins"
"github.com/mainflux/mainflux/twins/mocks"
"github.com/mainflux/senml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions vendor/github.com/insighio/senml/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions vendor/github.com/mainflux/senml/go.mod

This file was deleted.

6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ github.com/inconshreveable/mousetrap
github.com/influxdata/influxdb/client/v2
github.com/influxdata/influxdb/models
github.com/influxdata/influxdb/pkg/escape
# github.com/insighio/senml v1.2.0
## explicit
github.com/insighio/senml
# github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5
## explicit
github.com/jmoiron/sqlx
Expand Down Expand Up @@ -179,9 +182,6 @@ github.com/mainflux/mproxy/pkg/mqtt
github.com/mainflux/mproxy/pkg/session
github.com/mainflux/mproxy/pkg/tls
github.com/mainflux/mproxy/pkg/websocket
# github.com/mainflux/senml v1.5.0
## explicit
github.com/mainflux/senml
# github.com/mattn/go-colorable v0.1.4
github.com/mattn/go-colorable
# github.com/mattn/go-isatty v0.0.11
Expand Down

0 comments on commit ff73368

Please sign in to comment.