diff --git a/monitor/interface.go b/monitor/interface.go index 7789fab..21879af 100644 --- a/monitor/interface.go +++ b/monitor/interface.go @@ -3,7 +3,6 @@ package monitor import ( "sync" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/planetmint/planetmint-go/config" "github.com/syndtr/goleveldb/leveldb" ) @@ -11,7 +10,6 @@ import ( type MQTTMonitorClientI interface { AddParticipant(address string, lastSeenTS int64) (err error) SelectPoPParticipantsOutOfActiveActors() (challenger string, challengee string, err error) - SetContext(ctx sdk.Context) 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) { monitorMutex.Lock() challenger, challengee, err = mqttMonitorInstance.SelectPoPParticipantsOutOfActiveActors() diff --git a/monitor/mocks/mqtt_monitor.go b/monitor/mocks/mqtt_monitor.go index a08e814..ea020a8 100644 --- a/monitor/mocks/mqtt_monitor.go +++ b/monitor/mocks/mqtt_monitor.go @@ -1,9 +1,5 @@ package mocks -import ( - types "github.com/cosmos/cosmos-sdk/types" -) - // MockMQTTMonitorClientI is a mock of MQTTMonitorClientI interface. type MockMQTTMonitorClientI struct { myStringList []string @@ -27,10 +23,6 @@ func (m *MockMQTTMonitorClientI) SelectPoPParticipantsOutOfActiveActors() (strin return challenger, challengee, nil } -// SetContext mocks base method. -func (m *MockMQTTMonitorClientI) SetContext(_ types.Context) { -} - // Start mocks base method. func (m *MockMQTTMonitorClientI) Start() error { return nil diff --git a/monitor/mqtt_monitor.go b/monitor/mqtt_monitor.go index 45e08f1..39d8310 100644 --- a/monitor/mqtt_monitor.go +++ b/monitor/mqtt_monitor.go @@ -242,9 +242,3 @@ func (mms *MqttMonitor) Log(msg string) { util.GetAppLogger().Info(*localContext, msg) } } - -func (mms *MqttMonitor) SetContext(ctx sdk.Context) { - mms.contextMutex.Lock() - mms.sdkContext = &ctx - mms.contextMutex.Unlock() -} diff --git a/util/time.go b/util/time.go deleted file mode 100644 index e8ebd21..0000000 --- a/util/time.go +++ /dev/null @@ -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 -} diff --git a/util/time_test.go b/util/time_test.go deleted file mode 100644 index d56c517..0000000 --- a/util/time_test.go +++ /dev/null @@ -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) -} diff --git a/x/dao/abci.go b/x/dao/abci.go index 49680f0..0f562de 100644 --- a/x/dao/abci.go +++ b/x/dao/abci.go @@ -24,7 +24,6 @@ func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper) hexProposerAddress := hex.EncodeToString(proposerAddress) if isPopHeight(ctx, k, currentBlockHeight) { // select PoP participants - monitor.SetContext(ctx) challenger, challengee, err := monitor.SelectPoPParticipantsOutOfActiveActors() if err != nil { util.GetAppLogger().Error(ctx, "error during PoP Participant selection ", err)