Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare remove tx fee handler #164

Merged
merged 14 commits into from
Aug 29, 2022
Merged

Prepare remove tx fee handler #164

merged 14 commits into from
Aug 29, 2022

Conversation

miiu96
Copy link
Contributor

@miiu96 miiu96 commented Jul 27, 2022 •
edited
Loading

  • Integrated new elrond-go-core
  • Removed TransactionsFeeHandler

@miiu96 miiu96 self-assigned this Aug 16, 2022
@sstanculeanu sstanculeanu self-requested a review August 17, 2022 14:06
sstanculeanu
sstanculeanu previously approved these changes Aug 17, 2022
View reviewed changes
miiu96 added 2 commits August 29, 2022 12:42
@miiu96
Merge branch 'feat/altered-accounts' into prepare-remove-tx-fee-handler
7a177bf 
# Conflicts:
#	integrationtests/esdtTransfer_test.go
#	integrationtests/nftTransferCrossWithScCall_test.go
#	integrationtests/relayedTx_test.go
#	integrationtests/scCallIntraShard_test.go
#	integrationtests/transactions_test.go
#	process/block/blockProcessor_test.go
#	process/elasticProcessor_test.go
#	process/transactions/transactionDBBuilder.go
#	workItems/workItemBlock_test.go
@miiu96
fix integration tests
846d81e
@bogdan-rosianu bogdan-rosianu self-requested a review August 29, 2022 11:52
sstanculeanu
sstanculeanu previously approved these changes Aug 29, 2022
View reviewed changes
bogdan-rosianu
bogdan-rosianu requested changes Aug 29, 2022
View reviewed changes
Copy link
Contributor

@bogdan-rosianu bogdan-rosianu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please run Inspect Code from your IDE. You will find some grammar issues, alongside with unsorted imports

mock/dbTransactionsHandlerStub.go
SerializeReceiptsCalled func(recs []*data.Receipt, buffSlice *data.BufferSlice, index string) error
SerializeScResultsCalled func(scrs []*data.ScResult, buffSlice *data.BufferSlice, index string) error
}

func (tps *DBTransactionProcessorStub) SerializeTransactionWithRefund(_ map[string]*data.Transaction, _ map[string]*data.RefundData, _ *data.BufferSlice, _ string) error {
func (tps *DBTransactionProcessorStub) SerializeTransactionsFeeData(_ map[string]*data.FeeData, _ *data.BufferSlice, _ string) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

process/transactions/serialize.go
)

// SerializeScResults will serialize the provided smart contract results in a way that Elastic Search expects a bulk request
// SerializeScResults will serialize the provided smart contract results in a way that ElasticSearch expects a bulk request
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elasticsearch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

process/transactions/serialize.go
@@ -31,7 +28,7 @@ func (tdp *txsDatabaseProcessor) SerializeScResults(scResults []*data.ScResult,
return nil
}

// SerializeReceipts will serialize the receipts in a way that Elastic Search expects a bulk request
// SerializeReceipts will serialize the receipts in a way that ElasticSearch expects a bulk request
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elasticsearch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

factory/indexerFactory.go
@@ -132,9 +130,6 @@ func checkDataIndexerParams(arguments *ArgsIndexerFactory) error {
if check.IfNil(arguments.Hasher) {
return indexer.ErrNilHasher
}
if check.IfNil(arguments.TransactionFeeCalculator) {
return indexer.ErrNilTransactionFeeCalculator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this err from errors.go

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

process/elasticProcessor.go
@@ -14,7 +14,7 @@ import (
"github.com/ElrondNetwork/elrond-go-core/core/check"
coreData "github.com/ElrondNetwork/elrond-go-core/data"
"github.com/ElrondNetwork/elrond-go-core/data/block"
"github.com/ElrondNetwork/elrond-go-core/data/indexer"
"github.com/ElrondNetwork/elrond-go-core/data/outport"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imports not sorted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@miiu96 miiu96 merged commit d984a80 into feat/altered-accounts Aug 29, 2022
@miiu96 miiu96 deleted the prepare-remove-tx-fee-handler branch August 29, 2022 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sstanculeanu sstanculeanu sstanculeanu approved these changes

@bogdan-rosianu bogdan-rosianu bogdan-rosianu approved these changes

Assignees

@miiu96 miiu96

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@miiu96 @sstanculeanu @bogdan-rosianu