mirror of
https://github.com/planetmint/planetmint-go.git
synced 2025-11-24 06:25:47 +00:00
* removed obsolete SetContext function/interface
* removed obsolete time conversion method Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
parent
708ff18845
commit
83ce62fce2
@ -3,7 +3,6 @@ package monitor
|
|||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
||||||
"github.com/planetmint/planetmint-go/config"
|
"github.com/planetmint/planetmint-go/config"
|
||||||
"github.com/syndtr/goleveldb/leveldb"
|
"github.com/syndtr/goleveldb/leveldb"
|
||||||
)
|
)
|
||||||
@ -11,7 +10,6 @@ import (
|
|||||||
type MQTTMonitorClientI interface {
|
type MQTTMonitorClientI interface {
|
||||||
AddParticipant(address string, lastSeenTS int64) (err error)
|
AddParticipant(address string, lastSeenTS int64) (err error)
|
||||||
SelectPoPParticipantsOutOfActiveActors() (challenger string, challengee string, err error)
|
SelectPoPParticipantsOutOfActiveActors() (challenger string, challengee string, err error)
|
||||||
SetContext(ctx sdk.Context)
|
|
||||||
Start() (err error)
|
Start() (err error)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,12 +45,6 @@ func LazyMqttMonitorLoader(homeDir string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetContext(ctx sdk.Context) {
|
|
||||||
monitorMutex.Lock()
|
|
||||||
mqttMonitorInstance.SetContext(ctx)
|
|
||||||
monitorMutex.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func SelectPoPParticipantsOutOfActiveActors() (challenger string, challengee string, err error) {
|
func SelectPoPParticipantsOutOfActiveActors() (challenger string, challengee string, err error) {
|
||||||
monitorMutex.Lock()
|
monitorMutex.Lock()
|
||||||
challenger, challengee, err = mqttMonitorInstance.SelectPoPParticipantsOutOfActiveActors()
|
challenger, challengee, err = mqttMonitorInstance.SelectPoPParticipantsOutOfActiveActors()
|
||||||
|
|||||||
@ -1,9 +1,5 @@
|
|||||||
package mocks
|
package mocks
|
||||||
|
|
||||||
import (
|
|
||||||
types "github.com/cosmos/cosmos-sdk/types"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MockMQTTMonitorClientI is a mock of MQTTMonitorClientI interface.
|
// MockMQTTMonitorClientI is a mock of MQTTMonitorClientI interface.
|
||||||
type MockMQTTMonitorClientI struct {
|
type MockMQTTMonitorClientI struct {
|
||||||
myStringList []string
|
myStringList []string
|
||||||
@ -27,10 +23,6 @@ func (m *MockMQTTMonitorClientI) SelectPoPParticipantsOutOfActiveActors() (strin
|
|||||||
return challenger, challengee, nil
|
return challenger, challengee, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetContext mocks base method.
|
|
||||||
func (m *MockMQTTMonitorClientI) SetContext(_ types.Context) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start mocks base method.
|
// Start mocks base method.
|
||||||
func (m *MockMQTTMonitorClientI) Start() error {
|
func (m *MockMQTTMonitorClientI) Start() error {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@ -242,9 +242,3 @@ func (mms *MqttMonitor) Log(msg string) {
|
|||||||
util.GetAppLogger().Info(*localContext, msg)
|
util.GetAppLogger().Info(*localContext, msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (mms *MqttMonitor) SetContext(ctx sdk.Context) {
|
|
||||||
mms.contextMutex.Lock()
|
|
||||||
mms.sdkContext = &ctx
|
|
||||||
mms.contextMutex.Unlock()
|
|
||||||
}
|
|
||||||
|
|||||||
25
util/time.go
25
util/time.go
@ -1,25 +0,0 @@
|
|||||||
package util
|
|
||||||
|
|
||||||
import (
|
|
||||||
"log"
|
|
||||||
"strconv"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func String2UnixTime(timeInput string) (int64, error) {
|
|
||||||
// Layout specifying the format of the input string
|
|
||||||
// Note: Go uses a specific reference time (Mon Jan 2 15:04:05 MST 2006) to define format layouts
|
|
||||||
layout := "2006-01-02T15:04:05"
|
|
||||||
log.Println("[app] [Monitor] [time] add time string: " + timeInput)
|
|
||||||
// Parse the string into a time.Time struct in local time zone
|
|
||||||
parsedTime, err := time.Parse(layout, timeInput)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert to UTC if not already
|
|
||||||
utcTime := parsedTime.UTC()
|
|
||||||
unixTime := utcTime.Unix()
|
|
||||||
log.Println("[app] [Monitor] [time] unix time: " + strconv.FormatInt(unixTime, 10))
|
|
||||||
return unixTime, nil
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
package util
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestString2UnixTime(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
input := "2024-03-26T11:10:41"
|
|
||||||
unixTime, err := String2UnixTime(input)
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Equal(t, int64(1711451441), unixTime)
|
|
||||||
}
|
|
||||||
@ -24,7 +24,6 @@ func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper)
|
|||||||
hexProposerAddress := hex.EncodeToString(proposerAddress)
|
hexProposerAddress := hex.EncodeToString(proposerAddress)
|
||||||
if isPopHeight(ctx, k, currentBlockHeight) {
|
if isPopHeight(ctx, k, currentBlockHeight) {
|
||||||
// select PoP participants
|
// select PoP participants
|
||||||
monitor.SetContext(ctx)
|
|
||||||
challenger, challengee, err := monitor.SelectPoPParticipantsOutOfActiveActors()
|
challenger, challengee, err := monitor.SelectPoPParticipantsOutOfActiveActors()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
util.GetAppLogger().Error(ctx, "error during PoP Participant selection ", err)
|
util.GetAppLogger().Error(ctx, "error during PoP Participant selection ", err)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user