Skip to content

Tests: Fix types in assertions and change to using libgoal client when getting PendingTransaction information #4754

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

Merged
michaeldiamant merged 3 commits into from
Nov 4, 2022
Merged

Tests: Fix types in assertions and change to using libgoal client when getting PendingTransaction information #4754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c1f273
Cast consensus version to string before equality assert.
algochoi Nov 4, 2022
f263be0
Change pending transactions parsing to use libgoal function
algochoi Nov 4, 2022
aa5c152
Merge branch 'master' into consensus-protocol-cast
algochoi Nov 4, 2022
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
2 changes: 1 addition & 1 deletion test/e2e-go/features/participation/participationExpiration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func testExpirationAccounts(t *testing.T, fixture *fixtures.RestClientFixture, f

blk, err := sClient.BookkeepingBlock(latestRound)
a.NoError(err)
a.Equal(blk.CurrentProtocol, protocolCheck)
a.Equal(string(blk.CurrentProtocol), protocolCheck)

sendMoneyTxn := fixture.SendMoneyAndWait(latestRound, amountToSendInitial, transactionFee, richAccount, sAccount, "")

Expand Down
10 changes: 1 addition & 9 deletions test/framework/fixtures/restClientFixture.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"unicode"

"github.com/algorand/go-algorand/data/basics"
"github.com/algorand/go-algorand/data/transactions"
"github.com/algorand/go-algorand/protocol"

"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -279,15 +278,8 @@ func (f *RestClientFixture) WaitForAllTxnsToConfirm(roundTimeout uint64, txidsAn
_, err := f.WaitForConfirmedTxn(roundTimeout, addr, txid)
if err != nil {
f.t.Logf("txn failed to confirm: ", addr, txid)
response, err := f.AlgodClient.GetRawPendingTransactions(0)
pendingTxns, err := f.LibGoalClient.GetParsedPendingTransactions(0)
if err == nil {
// Parse pending transaction response
var pendingTxns struct {
TopTransactions []transactions.SignedTxn
TotalTransactions uint64
}
err = protocol.DecodeReflect(response, &pendingTxns)
require.NoError(f.t, err)
pendingTxids := make([]string, 0, pendingTxns.TotalTransactions)
for _, txn := range pendingTxns.TopTransactions {
pendingTxids = append(pendingTxids, txn.Txn.ID().String())
Expand Down