Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions chain_capabilities/aptos/actions/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ func NewAptos(cfg *config.Config, p2pConfig map[string]string, aptosService type
messageBuilder: messageBuilder,
}

return a, a.initLimiters(limitsFactory)
return a, a.initLimiters(limitsFactory, lggr)
}

func (a *Aptos) initLimiters(limitsFactory limits.Factory) (err error) {
func (a *Aptos) initLimiters(limitsFactory limits.Factory, lggr logger.Logger) (err error) {
a.reportSizeLimit, err = limits.MakeUpperBoundLimiter(limitsFactory, cresettings.Default.PerWorkflow.ChainWrite.Aptos.ReportSizeLimit)
if err != nil {
return
Expand All @@ -84,8 +84,11 @@ func (a *Aptos) initLimiters(limitsFactory limits.Factory) (err error) {
if err != nil {
return
}

lggr.Debugw("Initializing write report block timestamp active period limiter", "activePeriod", cresettings.Default.PerWorkflow.FeatureAptosWriteReportBlockTimestampActivePeriod)
a.writeReportBlockTimestampActive, err = limits.MakeRangeLimiter(limitsFactory, cresettings.Default.PerWorkflow.FeatureAptosWriteReportBlockTimestampActivePeriod)
if err != nil {
return
}
return
}

Expand Down
2 changes: 2 additions & 0 deletions chain_capabilities/aptos/actions/write_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,13 @@ func (wr *writeReport) getTxnInfoFromChain(ctx context.Context, txHash string) (

func (wr *writeReport) includeBlockTimestampInReply(ctx context.Context) bool {
if wr.writeReportBlockTimestampActive == nil {
wr.lggr.Errorw("WriteReport block timestamp feature flag is nil")
return false
}
if wr.executionTimestamp.IsZero() {
wr.lggr.Errorw("ExecutionTimestamp is zero")
}
wr.lggr.Debugw("Checking write report block timestamp active period", "executionTimestamp", wr.executionTimestamp)
return wr.writeReportBlockTimestampActive.Check(ctx, commoncfg.NewTimestamp(wr.executionTimestamp)) == nil
}

Expand Down
6 changes: 3 additions & 3 deletions chain_capabilities/aptos/actions/write_report_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func newTestHelper(t *testing.T) *testHelper {
beholderProcessor: commontest.NopBeholderProcessor{},
messageBuilder: monitoring.NewMessageBuilder(types.ChainInfo{}, capabilities.CapabilityInfo{}, ""),
}
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}))
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}, lggr))
enableWriteReportBlockTimestampFeatureFlag(a)
return &testHelper{forwarderClient: mockClient, aptosService: mockService, aptos: a}
}
Expand Down Expand Up @@ -143,7 +143,7 @@ func newMultiNodeTestHelper(t *testing.T, transmissionIDStr string) (*testHelper
beholderProcessor: commontest.NopBeholderProcessor{},
messageBuilder: monitoring.NewMessageBuilder(types.ChainInfo{}, capabilities.CapabilityInfo{}, ""),
}
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}))
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}, lggr))
enableWriteReportBlockTimestampFeatureFlag(a)
return &testHelper{forwarderClient: mockClient, aptosService: mockService, aptos: a}, node0Addr
}
Expand Down Expand Up @@ -694,7 +694,7 @@ func TestWriteReport_PreSubmissionCheck(t *testing.T) {
beholderProcessor: commontest.NopBeholderProcessor{},
messageBuilder: monitoring.NewMessageBuilder(types.ChainInfo{}, capabilities.CapabilityInfo{}, ""),
}
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}))
require.NoError(t, a.initLimiters(limits.Factory{Logger: lggr}, lggr))
enableWriteReportBlockTimestampFeatureFlag(a)
h := &testHelper{forwarderClient: mockClient, aptosService: mockService, aptos: a}

Expand Down
Loading