Skip to content

go-algorand 2.7.1-beta #2314

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
algojohnlee merged 2 commits into from
Jun 22, 2021
Merged

go-algorand 2.7.1-beta #2314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
855fac7
Merge pull request #2313 from algorandskiy/pavel/extra-pages-api
tsachiherman Jun 21, 2021
0b18c94
Bump buildnumber.dat
onetechnical Jun 21, 2021
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 buildnumber.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0
1
7 changes: 4 additions & 3 deletions daemon/algod/api/server/v2/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func AccountDataToAccount(
AuthAddr: addrOrNil(record.AuthAddr),
AppsLocalState: &appsLocalState,
AppsTotalSchema: &totalAppSchema,
AppsTotalExtraPages: &totalExtraPages,
AppsTotalExtraPages: numOrNil(totalExtraPages),
}, nil
}

Expand Down Expand Up @@ -401,13 +401,13 @@ func ApplicationParamsToAppParams(gap *generated.ApplicationParams) (basics.AppP
func AppParamsToApplication(creator string, appIdx basics.AppIndex, appParams *basics.AppParams) generated.Application {
globalState := convertTKVToGenerated(&appParams.GlobalState)
extraProgramPages := uint64(appParams.ExtraProgramPages)
return generated.Application{
app := generated.Application{
Id: uint64(appIdx),
Params: generated.ApplicationParams{
Creator: creator,
ApprovalProgram: appParams.ApprovalProgram,
ClearStateProgram: appParams.ClearStateProgram,
ExtraProgramPages: &extraProgramPages,
ExtraProgramPages: numOrNil(extraProgramPages),
GlobalState: globalState,
LocalStateSchema: &generated.ApplicationStateSchema{
NumByteSlice: appParams.LocalStateSchema.NumByteSlice,
Expand All @@ -419,6 +419,7 @@ func AppParamsToApplication(creator string, appIdx basics.AppIndex, appParams *b
},
},
}
return app
}

// AssetParamsToAsset converts basics.AssetParams to generated.Asset
Expand Down
8 changes: 6 additions & 2 deletions daemon/algod/api/server/v2/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,12 @@ func TestAccount(t *testing.T) {
verifyCreatedApp := func(index int, appIdx basics.AppIndex, params basics.AppParams) {
require.Equal(t, uint64(appIdx), (*conv.CreatedApps)[index].Id)
require.Equal(t, params.ApprovalProgram, (*conv.CreatedApps)[index].Params.ApprovalProgram)
require.NotNil(t, (*conv.CreatedApps)[index].Params.ExtraProgramPages)
require.Equal(t, uint64(params.ExtraProgramPages), *(*conv.CreatedApps)[index].Params.ExtraProgramPages)
if params.ExtraProgramPages != 0 {
require.NotNil(t, (*conv.CreatedApps)[index].Params.ExtraProgramPages)
require.Equal(t, uint64(params.ExtraProgramPages), *(*conv.CreatedApps)[index].Params.ExtraProgramPages)
} else {
require.Nil(t, (*conv.CreatedApps)[index].Params.ExtraProgramPages)
}
require.NotNil(t, (*conv.CreatedApps)[index].Params.GlobalStateSchema)
require.Equal(t, params.GlobalStateSchema.NumUint, (*conv.CreatedApps)[index].Params.GlobalStateSchema.NumUint)
require.Equal(t, params.GlobalStateSchema.NumByteSlice, (*conv.CreatedApps)[index].Params.GlobalStateSchema.NumByteSlice)
Expand Down
2 changes: 0 additions & 2 deletions daemon/algod/api/server/v2/test/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ var poolAddrAssetsGolden = make([]generatedV2.AssetHolding, 0)
var poolAddrCreatedAssetsGolden = make([]generatedV2.Asset, 0)
var appLocalStates = make([]generatedV2.ApplicationLocalState, 0)
var appsTotalSchema = generatedV2.ApplicationStateSchema{}
var appsTotalExtraPages = uint64(0)
var appCreatedApps = make([]generatedV2.Application, 0)
var poolAddrResponseGolden = generatedV2.AccountResponse{
Address: poolAddr.String(),
Expand All @@ -73,7 +72,6 @@ var poolAddrResponseGolden = generatedV2.AccountResponse{
Status: "Not Participating",
AppsLocalState: &appLocalStates,
AppsTotalSchema: &appsTotalSchema,
AppsTotalExtraPages: &appsTotalExtraPages,
CreatedApps: &appCreatedApps,
}
var txnPoolGolden = make([]transactions.SignedTxn, 2)
Expand Down