Add Array type to go-gen

chipshort · chipshort · commit 1b9ecbcb73c0 · 2024-02-15T12:09:02.000+01:00
diff --git a/packages/go-gen/src/main.rs b/packages/go-gen/src/main.rs
@@ -251,7 +251,7 @@ mod tests {
                 Binary []byte `json:"binary"`
                 Checksum Checksum `json:"checksum"`
                 HexBinary string `json:"hex_binary"`
-                NestedBinary []*[]byte `json:"nested_binary"`
+                NestedBinary Array[*[]byte] `json:"nested_binary"`
                 Uint128 string `json:"uint128"`
             }"#,
         );
@@ -456,7 +456,7 @@ mod tests {
             code,
             r#"
             type A struct {
-                A [][][]*B `json:"a"`
+                A Array[Array[Array[*B]]] `json:"a"`
             }
             type B struct { }"#,
         );
@@ -470,7 +470,7 @@ mod tests {
             code,
             r#"
             type C struct {
-                C [][][]*string `json:"c"`
+                C Array[Array[Array[*string]]] `json:"c"`
             }"#,
         );
     }
diff --git a/packages/go-gen/src/schema.rs b/packages/go-gen/src/schema.rs
@@ -210,9 +210,9 @@ pub fn type_from_instance_type(
         // so we can pass null as elements
         // otherwise they would just be omitted from the array
         replace_custom_type(&if item_type.nullability == Nullability::Nullable {
-            format!("[]*{}", item_type.name)
+            format!("Array[*{}]", item_type.name)
         } else {
-            format!("[]{}", item_type.name)
+            format!("Array[{}]", item_type.name)
         })
     } else {
         unreachable!("instance type should be one of the above")
diff --git a/packages/go-gen/tests/cosmwasm_std__AllBalanceResponse.go b/packages/go-gen/tests/cosmwasm_std__AllBalanceResponse.go
@@ -1,6 +1,6 @@
 // AllBalancesResponse is the expected response to AllBalancesQuery
 type AllBalancesResponse struct {
-	Amount []Coin `json:"amount"` // in wasmvm, there is an alias for `[]Coin`
+	Amount Array[Coin] `json:"amount"`
 }
 
 // Coin is a string representation of the sdk.Coin type (more portable than sdk.Int)
diff --git a/packages/go-gen/tests/cosmwasm_std__AllDelegationsResponse.go b/packages/go-gen/tests/cosmwasm_std__AllDelegationsResponse.go
@@ -1,6 +1,6 @@
 // AllDelegationsResponse is the expected response to AllDelegationsQuery
 type AllDelegationsResponse struct {
-	Delegations []Delegation `json:"delegations"` // in wasmvm, there is an alias for `[]Delegation`
+	Delegations Array[Delegation] `json:"delegations"`
 }
 
 // Coin is a string representation of the sdk.Coin type (more portable than sdk.Int)
diff --git a/packages/go-gen/tests/cosmwasm_std__AllValidatorsResponse.go b/packages/go-gen/tests/cosmwasm_std__AllValidatorsResponse.go
@@ -1,6 +1,6 @@
 // AllValidatorsResponse is the expected response to AllValidatorsQuery
 type AllValidatorsResponse struct {
-	Validators []Validator `json:"validators"` // in wasmvm, there is an alias for `[]Validator`
+	Validators Array[Validator] `json:"validators"`
 }
 
 type Validator struct {
@@ -11,4 +11,4 @@ type Validator struct {
 	MaxChangeRate string `json:"max_change_rate"`
 	// decimal string, eg "0.02"
 	MaxCommission string `json:"max_commission"`
-}
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__BankMsg.go b/packages/go-gen/tests/cosmwasm_std__BankMsg.go
@@ -1,15 +1,15 @@
 // SendMsg contains instructions for a Cosmos-SDK/SendMsg
 // It has a fixed interface here and should be converted into the proper SDK format before dispatching
 type SendMsg struct {
-	Amount    []Coin `json:"amount"`
-	ToAddress string `json:"to_address"`
+	Amount    Array[Coin] `json:"amount"`
+	ToAddress string      `json:"to_address"`
 }
 
 // BurnMsg will burn the given coins from the contract's account.
 // There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper.
 // Important if a contract controls significant token supply that must be retired.
 type BurnMsg struct {
-	Amount []Coin `json:"amount"`
+	Amount Array[Coin] `json:"amount"`
 }
 
 type BankMsg struct {
diff --git a/packages/go-gen/tests/cosmwasm_std__DelegationResponse.go b/packages/go-gen/tests/cosmwasm_std__DelegationResponse.go
@@ -10,9 +10,9 @@ type Coin struct {
 }
 
 type FullDelegation struct {
-	AccumulatedRewards []Coin `json:"accumulated_rewards"` // in wasmvm, there is an alias for `[]Coin`
-	Amount             Coin   `json:"amount"`
-	CanRedelegate      Coin   `json:"can_redelegate"`
-	Delegator          string `json:"delegator"`
-	Validator          string `json:"validator"`
-}
+	AccumulatedRewards Array[Coin] `json:"accumulated_rewards"`
+	Amount             Coin        `json:"amount"`
+	CanRedelegate      Coin        `json:"can_redelegate"`
+	Delegator          string      `json:"delegator"`
+	Validator          string      `json:"validator"`
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__DelegationRewardsResponse.go b/packages/go-gen/tests/cosmwasm_std__DelegationRewardsResponse.go
@@ -1,10 +1,10 @@
 // See <https://github.com/cosmos/cosmos-sdk/blob/c74e2887b0b73e81d48c2f33e6b1020090089ee0/proto/cosmos/distribution/v1beta1/query.proto#L169-L178>
 type DelegationRewardsResponse struct {
-	Rewards []DecCoin `json:"rewards"`
+	Rewards Array[DecCoin] `json:"rewards"` // in wasmvm, this has type `[]DecCoin`
 }
 
 // A coin type with decimal amount. Modeled after the Cosmos SDK's [DecCoin](https://github.com/cosmos/cosmos-sdk/blob/c74e2887b0b73e81d48c2f33e6b1020090089ee0/proto/cosmos/base/v1beta1/coin.proto#L32-L41) type
 type DecCoin struct {
 	Amount string `json:"amount"`
 	Denom  string `json:"denom"`
-}
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__DelegationTotalRewardsResponse.go b/packages/go-gen/tests/cosmwasm_std__DelegationTotalRewardsResponse.go
@@ -1,7 +1,7 @@
 // See <https://github.com/cosmos/cosmos-sdk/blob/c74e2887b0b73e81d48c2f33e6b1020090089ee0/proto/cosmos/distribution/v1beta1/query.proto#L189-L200>
 type DelegationTotalRewardsResponse struct {
-	Rewards []DelegatorReward `json:"rewards"`
-	Total   []DecCoin         `json:"total"`
+	Rewards Array[DelegatorReward] `json:"rewards"` // in wasmvm, this has type `[]DelegatorReward`
+	Total   Array[DecCoin]         `json:"total"`   // in wasmvm, this has type `[]DecCoin`
 }
 
 // A coin type with decimal amount. Modeled after the Cosmos SDK's [DecCoin](https://github.com/cosmos/cosmos-sdk/blob/c74e2887b0b73e81d48c2f33e6b1020090089ee0/proto/cosmos/base/v1beta1/coin.proto#L32-L41) type
@@ -11,6 +11,6 @@ type DecCoin struct {
 }
 
 type DelegatorReward struct {
-	Reward           []DecCoin `json:"reward"`
-	ValidatorAddress string    `json:"validator_address"`
-}
+	Reward           Array[DecCoin] `json:"reward"` // in wasmvm, this has type `[]DecCoin`
+	ValidatorAddress string         `json:"validator_address"`
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__DelegatorValidatorsResponse.go b/packages/go-gen/tests/cosmwasm_std__DelegatorValidatorsResponse.go
@@ -1,4 +1,4 @@
 // See <https://github.com/cosmos/cosmos-sdk/blob/b0acf60e6c39f7ab023841841fc0b751a12c13ff/proto/cosmos/distribution/v1beta1/query.proto#L212-L220>
 type DelegatorValidatorsResponse struct {
-	Validators []string `json:"validators"`
-}
+	Validators Array[string] `json:"validators"` // in wasmvm, this has type `[]string`
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__DenomMetadataResponse.go b/packages/go-gen/tests/cosmwasm_std__DenomMetadataResponse.go
@@ -7,8 +7,8 @@ type DenomMetadata struct {
 	// Base represents the base denom (should be the DenomUnit with exponent = 0).
 	Base string `json:"base"`
 	// DenomUnits represents the list of DenomUnits for a given coin
-	DenomUnits  []DenomUnit `json:"denom_units"`
-	Description string      `json:"description"`
+	DenomUnits  Array[DenomUnit] `json:"denom_units"` // in wasmvm, this has type `[]DenomUnit`
+	Description string           `json:"description"`
 	// Display indicates the suggested denom that should be
 	// displayed in clients.
 	Display string `json:"display"`
@@ -35,7 +35,7 @@ type DenomMetadata struct {
 // Replicating the cosmos-sdk bank module DenomUnit type
 type DenomUnit struct {
 	// Aliases is a list of string aliases for the given denom
-	Aliases []string `json:"aliases"`
+	Aliases Array[string] `json:"aliases"` // in wasmvm, this has type `[]string`
 	// Denom represents the string name of the given denom unit (e.g uatom).
 	Denom string `json:"denom"`
 	// Exponent represents power of 10 exponent that one must
@@ -44,4 +44,4 @@ type DenomUnit struct {
 	// (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with
 	// exponent = 6, thus: 1 atom = 10^6 uatom).
 	Exponent uint32 `json:"exponent"`
-}
+}
diff --git a/packages/go-gen/tests/cosmwasm_std__DistributionMsg.go b/packages/go-gen/tests/cosmwasm_std__DistributionMsg.go
@@ -16,7 +16,7 @@ type WithdrawDelegatorRewardMsg struct {
 // `depositor` is automatically filled with the current contract's address
 type FundCommunityPoolMsg struct {
 	// Amount is the list of coins to be send to the community pool
-	Amount []Coin `json:"amount"`
+	Amount Array[Coin] `json:"amount"`
 }
 
 type DistributionMsg struct {
diff --git a/packages/go-gen/tests/cosmwasm_std__GovMsg.go b/packages/go-gen/tests/cosmwasm_std__GovMsg.go
@@ -8,8 +8,8 @@ type VoteMsg struct {
 }
 
 type VoteWeightedMsg struct {
-	Options    []WeightedVoteOption `json:"options"`
-	ProposalID uint64               `json:"proposal_id"` // in wasmvm, this is `ProposalId`
+	Options    Array[WeightedVoteOption] `json:"options"`     // in wasmvm, this has type `[]WeightedVoteOption`
+	ProposalID uint64                    `json:"proposal_id"` // in wasmvm, this is `ProposalId`
 }
 
 type GovMsg struct {
diff --git a/packages/go-gen/tests/cosmwasm_std__WasmMsg.go b/packages/go-gen/tests/cosmwasm_std__WasmMsg.go
@@ -10,7 +10,7 @@ type ExecuteMsg struct {
 	// the contract ID and instance ID. The sdk module should maintain a reverse lookup table.
 	ContractAddr string `json:"contract_addr"`
 	// Send is an optional amount of coins this contract sends to the called contract
-	Funds []Coin `json:"funds"`
+	Funds Array[Coin] `json:"funds"`
 	// Msg is assumed to be a json-encoded message, which will be passed directly
 	// as `userMsg` when calling `Handle` on the above-defined contract
 	Msg []byte `json:"msg"`
@@ -24,7 +24,7 @@ type InstantiateMsg struct {
 	// CodeID is the reference to the wasm byte code as used by the Cosmos-SDK
 	CodeID uint64 `json:"code_id"`
 	// Send is an optional amount of coins this contract sends to the called contract
-	Funds []Coin `json:"funds"`
+	Funds Array[Coin] `json:"funds"`
 	// Label is optional metadata to be stored with a contract instance.
 	Label string `json:"label"`
 	// Msg is assumed to be a json-encoded message, which will be passed directly
@@ -40,7 +40,7 @@ type Instantiate2Msg struct {
 	// CodeID is the reference to the wasm byte code as used by the Cosmos-SDK
 	CodeID uint64 `json:"code_id"`
 	// Send is an optional amount of coins this contract sends to the called contract
-	Funds []Coin `json:"funds"`
+	Funds Array[Coin] `json:"funds"`
 	// Label is optional metadata to be stored with a contract instance.
 	Label string `json:"label"`
 	// Msg is assumed to be a json-encoded message, which will be passed directly

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// AllBalancesResponse is the expected response to AllBalancesQuery`
`2`	`2`	`type AllBalancesResponse struct {`
`3`		- Amount []Coin `json:"amount"` // in wasmvm, there is an alias for `[]Coin`
	`3`	+ Amount Array[Coin] `json:"amount"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`// Coin is a string representation of the sdk.Coin type (more portable than sdk.Int)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// AllDelegationsResponse is the expected response to AllDelegationsQuery`
`2`	`2`	`type AllDelegationsResponse struct {`
`3`		- Delegations []Delegation `json:"delegations"` // in wasmvm, there is an alias for `[]Delegation`
	`3`	+ Delegations Array[Delegation] `json:"delegations"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`// Coin is a string representation of the sdk.Coin type (more portable than sdk.Int)`