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

Cover transaction manager with additional test cases #561 #601

Merged
merged 9 commits into from
Feb 5, 2018
Merged

Cover transaction manager with additional test cases #561 #601

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d81554b
more configuration for setupTransactionPoolAPI
canercidam Feb 1, 2018
4c3d4be
change timeout
canercidam Feb 1, 2018
155a424
fix bad expected values
canercidam Feb 1, 2018
35a2a31
revert timeout
canercidam Feb 1, 2018
e3d708a
merge fixes from #537
canercidam Feb 2, 2018
16a05eb
fix hanging test
canercidam Feb 2, 2018
1b3dbde
table-driven gas and gas price tests
canercidam Feb 2, 2018
70e00f7
rename ctxTimeout to rpcCallTimeout
canercidam Feb 5, 2018
347f726
reduce args
canercidam Feb 5, 2018
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
31 changes: 16 additions & 15 deletions geth/transactions/txqueue_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,31 @@ func (s *TxQueueTestSuite) TearDownTest() {
s.client.Close()
}

func (s *TxQueueTestSuite) setupTransactionPoolAPI(tx *common.QueuedTx, config *params.NodeConfig, account *common.SelectedExtKey, nonce *hexutil.Uint64, gas *hexutil.Big, txErr error) {
var (
testGas = (*hexutil.Big)(big.NewInt(defaultGas + 1))
testGasPrice = (*hexutil.Big)(big.NewInt(10))
testNonce = hexutil.Uint64(10)
Copy link
Contributor

Choose a reason for hiding this comment

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

i will be using non-default nonce here #538 , so it is not very good idea. but you can leave it if you want. i can rebase

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, okay. I'll just revert changes for nonce then.

)

func (s *TxQueueTestSuite) setupTransactionPoolAPI(tx *common.QueuedTx, config *params.NodeConfig, account *common.SelectedExtKey, txErr error) {
// Expect calls to gas functions only if there are no user defined values.
// And also set the expected gas and gas price for RLP encoding the expected tx.
var usedGas, usedGasPrice *big.Int
s.txServiceMock.EXPECT().GetTransactionCount(gomock.Any(), account.Address, gethrpc.PendingBlockNumber).Return(nonce, nil)
s.txServiceMock.EXPECT().GetTransactionCount(gomock.Any(), account.Address, gethrpc.PendingBlockNumber).Return(&testNonce, nil)
if tx.Args.GasPrice == nil {
usedGasPrice = big.NewInt(10)
usedGasPrice = (*big.Int)(testGasPrice)
s.txServiceMock.EXPECT().GasPrice(gomock.Any()).Return(usedGasPrice, nil)
} else {
usedGasPrice = (*big.Int)(tx.Args.GasPrice)
}
if tx.Args.Gas == nil {
s.txServiceMock.EXPECT().EstimateGas(gomock.Any(), gomock.Any()).Return(gas, nil)
usedGas = (*big.Int)(gas)
s.txServiceMock.EXPECT().EstimateGas(gomock.Any(), gomock.Any()).Return(testGas, nil)
usedGas = (*big.Int)(testGas)
} else {
usedGas = (*big.Int)(tx.Args.Gas)
}
// Prepare the transaction anD RLP encode it.
data := s.rlpEncodeTx(tx, config, account, nonce, usedGas, usedGasPrice)
data := s.rlpEncodeTx(tx, config, account, &testNonce, usedGas, usedGasPrice)
// Expect the RLP encoded transaction.
s.txServiceMock.EXPECT().SendRawTransaction(gomock.Any(), data).Return(gethcommon.Hash{}, txErr)
}
Expand Down Expand Up @@ -120,9 +126,6 @@ func (s *TxQueueTestSuite) TestCompleteTransaction() {
AccountKey: &keystore.Key{PrivateKey: key},
}

nonce := hexutil.Uint64(10)
gas := hexutil.Big(*big.NewInt(defaultGas + 1))

testCases := []struct {
name string
gas *hexutil.Big
Expand All @@ -135,13 +138,13 @@ func (s *TxQueueTestSuite) TestCompleteTransaction() {
},
{
"gasDefined",
(*hexutil.Big)(big.NewInt(100)),
testGas,
nil,
},
{
"gasPriceDefined",
nil,
(*hexutil.Big)(big.NewInt(100)),
testGasPrice,
},
}

Expand All @@ -155,7 +158,7 @@ func (s *TxQueueTestSuite) TestCompleteTransaction() {
Gas: testCase.gas,
GasPrice: testCase.gasPrice,
})
s.setupTransactionPoolAPI(tx, config, account, &nonce, &gas, nil)
s.setupTransactionPoolAPI(tx, config, account, nil)

txQueueManager := NewManager(s.nodeManagerMock, s.accountManagerMock)
txQueueManager.completionTimeout = time.Second
Expand Down Expand Up @@ -201,9 +204,7 @@ func (s *TxQueueTestSuite) TestCompleteTransactionMultipleTimes() {
To: common.ToAddress(TestConfig.Account2.Address),
})

nonce := hexutil.Uint64(10)
gas := hexutil.Big(*big.NewInt(defaultGas + 1))
s.setupTransactionPoolAPI(tx, config, account, &nonce, &gas, nil)
s.setupTransactionPoolAPI(tx, config, account, nil)

txQueueManager := NewManager(s.nodeManagerMock, s.accountManagerMock)
txQueueManager.completionTimeout = time.Second
Expand Down