-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rc/v1.7.next1' into update_deps
- Loading branch information
Showing
17 changed files
with
648 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| //go:build integrationtests | ||
|
|
||
| package integrationtests | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/hex" | ||
| dataBlock "github.com/multiversx/mx-chain-core-go/data/block" | ||
| "github.com/multiversx/mx-chain-core-go/data/outport" | ||
| "github.com/multiversx/mx-chain-core-go/data/transaction" | ||
| indexerdata "github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer" | ||
| "github.com/stretchr/testify/require" | ||
| "math/big" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestRelayedTxV3(t *testing.T) { | ||
| setLogLevelDebug() | ||
|
|
||
| esClient, err := createESClient(esURL) | ||
| require.Nil(t, err) | ||
|
|
||
| esProc, err := CreateElasticProcessor(esClient) | ||
| require.Nil(t, err) | ||
|
|
||
| txHash := []byte("relayedTxV3") | ||
| header := &dataBlock.Header{ | ||
| Round: 50, | ||
| TimeStamp: 5040, | ||
| } | ||
|
|
||
| body := &dataBlock.Body{ | ||
| MiniBlocks: dataBlock.MiniBlockSlice{ | ||
| { | ||
| Type: dataBlock.TxBlock, | ||
| SenderShardID: 0, | ||
| ReceiverShardID: 0, | ||
| TxHashes: [][]byte{txHash}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| address1 := "erd1k7j6ewjsla4zsgv8v6f6fe3dvrkgv3d0d9jerczw45hzedhyed8sh2u34u" | ||
| address2 := "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht" | ||
| initialTx := &transaction.Transaction{ | ||
| Nonce: 1000, | ||
| SndAddr: decodeAddress(address1), | ||
| RcvAddr: decodeAddress(address2), | ||
| GasLimit: 15406000, | ||
| GasPrice: 1000000000, | ||
| Value: big.NewInt(0), | ||
| InnerTransactions: []*transaction.Transaction{ | ||
| { | ||
| Nonce: 10, | ||
| SndAddr: decodeAddress(address1), | ||
| RcvAddr: decodeAddress(address2), | ||
| GasLimit: 15406000, | ||
| GasPrice: 1000000000, | ||
| Value: big.NewInt(0), | ||
| }, | ||
| { | ||
| Nonce: 20, | ||
| SndAddr: decodeAddress(address1), | ||
| RcvAddr: decodeAddress(address2), | ||
| GasLimit: 15406000, | ||
| GasPrice: 1000000000, | ||
| Value: big.NewInt(1000), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| txInfo := &outport.TxInfo{ | ||
| Transaction: initialTx, | ||
| FeeInfo: &outport.FeeInfo{ | ||
| GasUsed: 10556000, | ||
| Fee: big.NewInt(2257820000000000), | ||
| InitialPaidFee: big.NewInt(2306320000000000), | ||
| }, | ||
| ExecutionOrder: 0, | ||
| } | ||
|
|
||
| pool := &outport.TransactionPool{ | ||
| Transactions: map[string]*outport.TxInfo{ | ||
| hex.EncodeToString(txHash): txInfo, | ||
| }, | ||
| } | ||
| err = esProc.SaveTransactions(createOutportBlockWithHeader(body, header, pool, nil, testNumOfShards)) | ||
| require.Nil(t, err) | ||
|
|
||
| ids := []string{hex.EncodeToString(txHash)} | ||
| genericResponse := &GenericResponse{} | ||
| err = esClient.DoMultiGet(context.Background(), ids, indexerdata.TransactionsIndex, true, genericResponse) | ||
| require.Nil(t, err) | ||
|
|
||
| require.JSONEq(t, | ||
| readExpectedResult("./testdata/relayedTxV3/relayed-tx-v3.json"), | ||
| string(genericResponse.Docs[0].Source), | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "miniBlockHash": "b3222be4506429fa237393c56b732a283eea5ccab465deb66b6348083793b6c9", | ||
| "nonce": 1000, | ||
| "round": 50, | ||
| "value": "0", | ||
| "valueNum": 0, | ||
| "receiver": "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht", | ||
| "sender": "erd1k7j6ewjsla4zsgv8v6f6fe3dvrkgv3d0d9jerczw45hzedhyed8sh2u34u", | ||
| "receiverShard": 0, | ||
| "senderShard": 0, | ||
| "gasPrice": 1000000000, | ||
| "gasLimit": 15406000, | ||
| "gasUsed": 10556000, | ||
| "fee": "2257820000000000", | ||
| "feeNum": 0.00225782, | ||
| "initialPaidFee": "2306320000000000", | ||
| "data": null, | ||
| "signature": "", | ||
| "timestamp": 5040, | ||
| "status": "success", | ||
| "searchOrder": 0, | ||
| "receivers": [ | ||
| "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht", | ||
| "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht" | ||
| ], | ||
| "receiversShardIDs": [ | ||
| 1, | ||
| 1 | ||
| ], | ||
| "operation": "transfer", | ||
| "isRelayed": true, | ||
| "innerTransactions": [ | ||
| { | ||
| "nonce": 10, | ||
| "value": "0", | ||
| "receiver": "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht", | ||
| "sender": "erd1k7j6ewjsla4zsgv8v6f6fe3dvrkgv3d0d9jerczw45hzedhyed8sh2u34u", | ||
| "gasPrice": 1000000000, | ||
| "gasLimit": 15406000, | ||
| "chainID": "", | ||
| "version": 0 | ||
| }, | ||
| { | ||
| "nonce": 20, | ||
| "value": "1000", | ||
| "receiver": "erd14eyayfrvlrhzfrwg5zwleua25mkzgncggn35nvc6xhv5yxwml2es0f3dht", | ||
| "sender": "erd1k7j6ewjsla4zsgv8v6f6fe3dvrkgv3d0d9jerczw45hzedhyed8sh2u34u", | ||
| "gasPrice": 1000000000, | ||
| "gasLimit": 15406000, | ||
| "chainID": "", | ||
| "version": 0 | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,13 @@ | ||
| package templatesAndPolicies | ||
|
|
||
| import "bytes" | ||
| import ( | ||
| "bytes" | ||
|
|
||
| "github.com/multiversx/mx-chain-es-indexer-go/templates" | ||
| ) | ||
|
|
||
| // TemplatesAndPoliciesHandler defines the actions that a templates and policies handler should do | ||
| type TemplatesAndPoliciesHandler interface { | ||
| GetElasticTemplatesAndPolicies() (map[string]*bytes.Buffer, map[string]*bytes.Buffer, error) | ||
| GetExtraMappings() ([]templates.ExtraMapping, error) | ||
| } |
Oops, something went wrong.