diff --git a/chain_capabilities/aptos/actions/actions.go b/chain_capabilities/aptos/actions/actions.go index f60978a8d..eccaa7bcc 100644 --- a/chain_capabilities/aptos/actions/actions.go +++ b/chain_capabilities/aptos/actions/actions.go @@ -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 @@ -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 } diff --git a/chain_capabilities/aptos/actions/write_report.go b/chain_capabilities/aptos/actions/write_report.go index b0582714f..679055093 100644 --- a/chain_capabilities/aptos/actions/write_report.go +++ b/chain_capabilities/aptos/actions/write_report.go @@ -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 } diff --git a/chain_capabilities/aptos/actions/write_report_test.go b/chain_capabilities/aptos/actions/write_report_test.go index d51788a53..f21bc9f93 100644 --- a/chain_capabilities/aptos/actions/write_report_test.go +++ b/chain_capabilities/aptos/actions/write_report_test.go @@ -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} } @@ -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 } @@ -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}