@@ -58,18 +58,18 @@ func (k Keeper) ProcessTallies(ctx sdk.Context) error {
5858
5959 // Loop through the list to apply filter, execute tally, and post
6060 // execution result.
61- tallyResults := make ([] TallyResult , tallyLen )
62- dataResults := make ([] batchingtypes.DataResult , tallyLen )
61+ var tallyResult TallyResult
62+ var dataResult batchingtypes.DataResult
6363
64- for i , id := range drIDs {
64+ for _ , id := range drIDs {
6565 dr , err := k .GetDataRequest (ctx , id )
6666 if err != nil {
6767 telemetry .SetGauge (1 , types .TelemetryKeyDRFlowHalt )
6868 k .Logger (ctx ).Error ("[HALTS_DR_FLOW] failed to retrieve data request" , "err" , err )
6969 return nil
7070 }
7171
72- dataResults [ i ] = batchingtypes.DataResult {
72+ dataResult = batchingtypes.DataResult {
7373 DrId : dr .Id ,
7474 //nolint:gosec // G115: Block height is never negative.
7575 DrBlockHeight : uint64 (dr .PostedHeight ),
@@ -92,19 +92,19 @@ func (k Keeper) ProcessTallies(ctx sdk.Context) error {
9292 gasMeter := types .NewGasMeter (dr .TallyGasLimit , dr .ExecGasLimit , tallyConfig .MaxTallyGasLimit , dr .PostedGasPrice , tallyConfig .GasCostBase )
9393
9494 if len (dr .Commits ) < int (dr .ReplicationFactor ) {
95- dataResults [ i ] .Result = []byte (fmt .Sprintf ("need %d commits; received %d" , dr .ReplicationFactor , len (dr .Commits )))
96- dataResults [ i ] .ExitCode = types .TallyExitCodeNotEnoughCommits
95+ dataResult .Result = []byte (fmt .Sprintf ("need %d commits; received %d" , dr .ReplicationFactor , len (dr .Commits )))
96+ dataResult .ExitCode = types .TallyExitCodeNotEnoughCommits
9797 k .Logger (ctx ).Info ("data request's number of commits did not meet replication factor" , "request_id" , dr .Id )
9898
9999 MeterExecutorGasFallback (dr , tallyConfig .ExecutionGasCostFallback , gasMeter )
100100 } else {
101- _ , tallyResults [ i ] = k .FilterAndTally (ctx , dr , tallyConfig , gasMeter )
102- dataResults [ i ] .Result = tallyResults [ i ] .Result
103- dataResults [ i ] .ExitCode = tallyResults [ i ] .ExitCode
104- dataResults [ i ] .Consensus = tallyResults [ i ] .Consensus
101+ _ , tallyResult = k .FilterAndTally (ctx , dr , tallyConfig , gasMeter )
102+ dataResult .Result = tallyResult .Result
103+ dataResult .ExitCode = tallyResult .ExitCode
104+ dataResult .Consensus = tallyResult .Consensus
105105
106106 k .Logger (ctx ).Info ("completed tally" , "request_id" , dr .Id )
107- k .Logger (ctx ).Debug ("tally result" , "request_id" , dr .Id , "tally_result" , tallyResults [ i ] )
107+ k .Logger (ctx ).Debug ("tally result" , "request_id" , dr .Id , "tally_result" , tallyResult )
108108 }
109109
110110 distributions := k .GetGasMeterResults (ctx , gasMeter , dr .Id , dr .PostedHeight , tallyConfig .BurnRatio )
@@ -128,35 +128,33 @@ func (k Keeper) ProcessTallies(ctx sdk.Context) error {
128128 return err
129129 }
130130
131- dataResults [ i ] .GasUsed = gasMeter .TotalGasUsed ()
132- dataResults [ i ] .Id , err = dataResults [ i ] .TryHash ()
131+ dataResult .GasUsed = gasMeter .TotalGasUsed ()
132+ dataResult .Id , err = dataResult .TryHash ()
133133 if err != nil {
134134 return err
135135 }
136- }
137136
138- // Store the data results for batching.
139- for i := range dataResults {
140- err := k .batchingKeeper .SetDataResultForBatching (ctx , dataResults [i ])
137+ // Store the data results for batching.
138+ err = k .batchingKeeper .SetDataResultForBatching (ctx , dataResult )
141139 // If writing to the store fails we should stop the node to prevent acting on invalid state.
142140 if err != nil {
143141 k .Logger (ctx ).Error ("failed to store data result for batching" , "err" , err )
144142 return err
145143 }
146144
147- k .Logger (ctx ).Info ("tally flow completed" , "request_id" , dataResults [ i ] .DrId )
145+ k .Logger (ctx ).Info ("tally flow completed" , "request_id" , dataResult .DrId )
148146 ctx .EventManager ().EmitEvent (
149147 sdk .NewEvent (
150148 types .EventTypeTallyCompletion ,
151- sdk .NewAttribute (types .AttributeDataResultID , dataResults [ i ] .Id ),
152- sdk .NewAttribute (types .AttributeDataRequestID , dataResults [ i ] .DrId ),
153- sdk .NewAttribute (types .AttributeTypeConsensus , strconv .FormatBool (dataResults [ i ] .Consensus )),
154- sdk .NewAttribute (types .AttributeTallyVMStdOut , strings .Join (tallyResults [ i ] .StdOut , "\n " )),
155- sdk .NewAttribute (types .AttributeTallyVMStdErr , strings .Join (tallyResults [ i ] .StdErr , "\n " )),
156- sdk .NewAttribute (types .AttributeExecGasUsed , fmt .Sprintf ("%v" , tallyResults [ i ] .ExecGasUsed )),
157- sdk .NewAttribute (types .AttributeTallyGasUsed , fmt .Sprintf ("%v" , tallyResults [ i ] .TallyGasUsed )),
158- sdk .NewAttribute (types .AttributeTallyExitCode , fmt .Sprintf ("%02x" , dataResults [ i ] .ExitCode )),
159- sdk .NewAttribute (types .AttributeProxyPubKeys , strings .Join (tallyResults [ i ] .ProxyPubKeys , "\n " )),
149+ sdk .NewAttribute (types .AttributeDataResultID , dataResult .Id ),
150+ sdk .NewAttribute (types .AttributeDataRequestID , dataResult .DrId ),
151+ sdk .NewAttribute (types .AttributeTypeConsensus , strconv .FormatBool (dataResult .Consensus )),
152+ sdk .NewAttribute (types .AttributeTallyVMStdOut , strings .Join (tallyResult .StdOut , "\n " )),
153+ sdk .NewAttribute (types .AttributeTallyVMStdErr , strings .Join (tallyResult .StdErr , "\n " )),
154+ sdk .NewAttribute (types .AttributeExecGasUsed , fmt .Sprintf ("%v" , tallyResult .ExecGasUsed )),
155+ sdk .NewAttribute (types .AttributeTallyGasUsed , fmt .Sprintf ("%v" , tallyResult .TallyGasUsed )),
156+ sdk .NewAttribute (types .AttributeTallyExitCode , fmt .Sprintf ("%02x" , dataResult .ExitCode )),
157+ sdk .NewAttribute (types .AttributeProxyPubKeys , strings .Join (tallyResult .ProxyPubKeys , "\n " )),
160158 ),
161159 )
162160 }
0 commit comments