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

algod: Migrate internal uses of v1 algod API to v2 #4684

Merged
merged 37 commits into from
Nov 3, 2022
Merged

algod: Migrate internal uses of v1 algod API to v2 #4684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
86fd07e
Delete kmd API affinity
algochoi Oct 12, 2022
c7f6cea
Delete affinity in algod
algochoi Oct 12, 2022
d3277ed
Migrate GetPendingTransactions
algochoi Oct 12, 2022
9dca911
Fix response field
algochoi Oct 13, 2022
5c846ba
Migrate Assets and Accounts to V2
algochoi Oct 18, 2022
ff0fb61
Fix linting and change pending transactions by addr
algochoi Oct 18, 2022
ad0606a
Change pending transaction and params/fee for v2 api
algochoi Oct 18, 2022
0e6c5ff
Change v1 block to v2/bookkeeping block response
algochoi Oct 20, 2022
60c2cba
Merge branch 'master' into v2-goal-migration
algochoi Oct 20, 2022
55f1662
Revise transaction parsing in tests
algochoi Oct 21, 2022
af4ae19
Fix asset call to include creatables
algochoi Oct 21, 2022
2ec5fc2
Fix asset field derefs
algochoi Oct 23, 2022
292b4f6
Try reverting goal waitfortxn
algochoi Oct 24, 2022
ca0eda3
Fix transaction encoding again
algochoi Oct 25, 2022
96bf392
Check for empty asset unit names to pass expect tests
algochoi Oct 25, 2022
08f14f1
Convert v1 endpoints to similar v2 endpoints and change tests
algochoi Oct 26, 2022
f69c7d3
Fix note test that was changed for debugging
algochoi Oct 26, 2022
5b0e7a7
Change pingpong tests to V2 api
algochoi Oct 27, 2022
1acdf98
Merge branch 'master' into v2-goal-migration
algochoi Oct 27, 2022
478dbec
Fix algoh mockClient tests
algochoi Oct 27, 2022
3125af5
Change send transaction API from v1 to v2
algochoi Oct 28, 2022
5c36058
Fix some tests regarding send transaction
algochoi Oct 28, 2022
8b212cb
Minor changes on comments and change expect test cases so error messa…
algochoi Oct 28, 2022
8c14f9c
Delete extraneous comments in client test
algochoi Nov 1, 2022
6e5f5bf
Rename PendingTransactionsStruct to PendingTransactions (#25)
michaeldiamant Nov 1, 2022
5ccca0d
use stateproof v2 api on tests
Nov 1, 2022
066d463
Delete extraneous function makeTestBlock inline
algochoi Nov 1, 2022
37a0812
Add blockstats test to check for event details (#26)
algochoi Nov 2, 2022
6af0e28
Merge branch 'v2-goal-migration' of https://github.com/algochoi/go-al…
algochoi Nov 2, 2022
99f2d2c
Change mockclient in algoh to make block with round number
algochoi Nov 2, 2022
bfe1a2f
Update cmd/algoh/blockstats.go
algochoi Nov 2, 2022
e1e2a4b
Add more error formatting for REST responses (#27)
jasonpaulos Nov 3, 2022
bb260ab
Change error messages on tests after client side parsing
algochoi Nov 3, 2022
bb5170f
Merge branch 'v2-goal-migration' of https://github.com/algochoi/go-al…
algochoi Nov 3, 2022
d21a9d6
Change http response message in SPFullPool test
algochoi Nov 3, 2022
5b680e3
Revise error message check
algochoi Nov 3, 2022
52f3b85
Delete old error message
algochoi Nov 3, 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
Prev Previous commit
Next Next commit
Fix asset call to include creatables
  • Loading branch information
@algochoi
algochoi committed Oct 21, 2022
commit af4ae1950a1092e17a313dd2c74d33daed972785
16 changes: 6 additions & 10 deletions cmd/goal/asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func lookupAssetID(cmd *cobra.Command, creator string, client libgoal.Client) {
"creator account is unknown.")
}

response, err := client.AccountInformationV2(creator, false)
response, err := client.AccountInformationV2(creator, true)
if err != nil {
reportErrorf(errorRequestFail, err)
}
Expand Down Expand Up @@ -771,23 +771,19 @@ var infoAssetCmd = &cobra.Command{
*asset.Params.Reserve = asset.Params.Creator
}

reserve, err := client.AccountInformationV2(*asset.Params.Reserve, false)
reserve, err := client.AccountInformationV2(*asset.Params.Reserve, true)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think client.AccountAssetInformation(*asset.Params.Reserve, assetID) could be used instead of client.AccountInformationV2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Followed up offline: It looks like we'd want to change the behavior so that goal asset info fails if the reserve doesn’t hold the asset - this will likely involve changing a test (test/scripts/e2e_subs/asset-misc.sh) to address this in a follow-up PR.

if err != nil {
reportErrorf(errorRequestFail, err)
}

var res *generated.AssetHolding
var res generated.AssetHolding
if reserve.Assets != nil {
for _, asset := range *reserve.Assets {
if assetID == asset.AssetId {
*res = asset
for _, reserveAsset := range *reserve.Assets {
if assetID == reserveAsset.AssetId {
res = reserveAsset
break
}
}
// Asset ID was not found in account
if res == nil {
reportErrorf(errorRequestFail, "cannot find asset ID in account")
}
} else {
reportErrorf(errorRequestFail, "cannot find asset ID in account")
}
Expand Down
20 changes: 10 additions & 10 deletions test/e2e-go/features/transactions/asset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func TestAssetConfig(t *testing.T) {
a.NoError(err)

// There should be no assets to start with
info, err := client.AccountInformationV2(account0, false)
info, err := client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 0)
Expand Down Expand Up @@ -270,7 +270,7 @@ func TestAssetConfig(t *testing.T) {
}

// Check that assets are visible
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.Assets)
a.Equal(maxAssetsCount, len(*info.CreatedAssets))
Expand Down Expand Up @@ -338,7 +338,7 @@ func TestAssetConfig(t *testing.T) {
confirmed = fixture.WaitForAllTxnsToConfirm(status.LastRound+20, txids)
a.True(confirmed, "changing keys")

info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(maxAssetsCount, len(*info.CreatedAssets))
Expand Down Expand Up @@ -741,7 +741,7 @@ func TestAssetSend(t *testing.T) {
confirmed := fixture.WaitForAllTxnsToConfirm(curRound+20, txids)
a.True(confirmed, "creating assets")

info, err := client.AccountInformationV2(account0, false)
info, err := client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 2)
Expand Down Expand Up @@ -995,7 +995,7 @@ func TestAssetCreateWaitRestartDelete(t *testing.T) {
client = &fixture.LibGoalClient

// Check again that asset is visible
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 1)
Expand All @@ -1019,7 +1019,7 @@ func TestAssetCreateWaitRestartDelete(t *testing.T) {
submitAndWaitForTransaction(manager, tx, "destroying assets", client, fixture, a)

// Check again that asset is destroyed
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NoError(err)
a.NotNil(info.CreatedAssets)
Expand Down Expand Up @@ -1063,7 +1063,7 @@ func TestAssetCreateWaitBalLookbackDelete(t *testing.T) {
defer fixture.Shutdown()

// There should be no assets to start with
info, err := client.AccountInformationV2(account0, false)
info, err := client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 0)
Expand All @@ -1072,7 +1072,7 @@ func TestAssetCreateWaitBalLookbackDelete(t *testing.T) {
createAsset("test", account0, manager, reserve, freeze, clawback, client, fixture, a)

// Check that asset is visible
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 1)
Expand All @@ -1098,7 +1098,7 @@ func TestAssetCreateWaitBalLookbackDelete(t *testing.T) {
a.NoError(err)

// Check again that asset is visible
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 1)
Expand All @@ -1122,7 +1122,7 @@ func TestAssetCreateWaitBalLookbackDelete(t *testing.T) {
submitAndWaitForTransaction(manager, tx, "destroying assets", client, fixture, a)

// Check again that asset is destroyed
info, err = client.AccountInformationV2(account0, false)
info, err = client.AccountInformationV2(account0, true)
a.NoError(err)
a.NotNil(info.CreatedAssets)
a.Equal(len(*info.CreatedAssets), 0)
Expand Down