Cast uint types so that stringify works

alexsporn · alexsporn · commit 1ff32343229e · 2024-05-02T17:03:30.000+02:00
diff --git a/pkg/model/account_diff.go b/pkg/model/account_diff.go
@@ -77,10 +77,10 @@ func (d *AccountDiff) Clone() *AccountDiff {
 
 func (d *AccountDiff) String() string {
 	builder := stringify.NewStructBuilder("AccountDiff")
-	builder.AddField(stringify.NewStructField("BICChange", d.BICChange))
-	builder.AddField(stringify.NewStructField("PreviousUpdatedSlot", d.PreviousUpdatedSlot))
-	builder.AddField(stringify.NewStructField("NewExpirySlot", d.NewExpirySlot))
-	builder.AddField(stringify.NewStructField("PreviousExpirySlot", d.PreviousExpirySlot))
+	builder.AddField(stringify.NewStructField("BICChange", int64(d.BICChange)))
+	builder.AddField(stringify.NewStructField("PreviousUpdatedSlot", uint32(d.PreviousUpdatedSlot)))
+	builder.AddField(stringify.NewStructField("NewExpirySlot", uint32(d.NewExpirySlot)))
+	builder.AddField(stringify.NewStructField("PreviousExpirySlot", uint32(d.PreviousExpirySlot)))
 	builder.AddField(stringify.NewStructField("NewOutputID", d.NewOutputID))
 	builder.AddField(stringify.NewStructField("PreviousOutputID", d.PreviousOutputID))
 	builder.AddField(stringify.NewStructField("BlockIssuerKeysAdded", d.BlockIssuerKeysAdded))
diff --git a/pkg/model/poolstats.go b/pkg/model/poolstats.go
@@ -62,8 +62,8 @@ func (p *PoolsStats) Bytes() ([]byte, error) {
 
 func (p *PoolsStats) String() string {
 	return stringify.Struct("PoolsStats",
-		stringify.NewStructField("TotalStake", p.TotalStake),
-		stringify.NewStructField("TotalValidatorStake", p.TotalValidatorStake),
+		stringify.NewStructField("TotalStake", uint64(p.TotalStake)),
+		stringify.NewStructField("TotalValidatorStake", uint64(p.TotalValidatorStake)),
 		stringify.NewStructField("ProfitMargin", p.ProfitMargin),
 	)
 }
@@ -123,8 +123,8 @@ func (p *PoolRewards) Bytes() ([]byte, error) {
 
 func (p *PoolRewards) String() string {
 	return stringify.Struct("PoolRewards",
-		stringify.NewStructField("PoolStake", p.PoolStake),
-		stringify.NewStructField("PoolRewards", p.PoolRewards),
-		stringify.NewStructField("FixedCost", p.FixedCost),
+		stringify.NewStructField("PoolStake", uint64(p.PoolStake)),
+		stringify.NewStructField("PoolRewards", uint64(p.PoolRewards)),
+		stringify.NewStructField("FixedCost", uint64(p.FixedCost)),
 	)
 }
diff --git a/pkg/model/version_and_hash.go b/pkg/model/version_and_hash.go
@@ -36,7 +36,7 @@ func VersionAndHashFromBytes(bytes []byte) (VersionAndHash, int, error) {
 
 func (v VersionAndHash) String() string {
 	return stringify.Struct("VersionAndHash",
-		stringify.NewStructField("Version", v.Version),
+		stringify.NewStructField("Version", byte(v.Version)),
 		stringify.NewStructField("Hash", v.Hash),
 	)
 }
diff --git a/pkg/protocol/engine/accounts/accounts.go b/pkg/protocol/engine/accounts/accounts.go
@@ -170,13 +170,13 @@ func (a *AccountData) String() string {
 	return stringify.Struct("AccountData",
 		stringify.NewStructField("ID", a.ID),
 		stringify.NewStructField("Credits", a.Credits),
-		stringify.NewStructField("ExpirySlot", a.ExpirySlot),
+		stringify.NewStructField("ExpirySlot", uint32(a.ExpirySlot)),
 		stringify.NewStructField("OutputID", a.OutputID),
 		stringify.NewStructField("BlockIssuerKeys", a.BlockIssuerKeys),
-		stringify.NewStructField("ValidatorStake", a.ValidatorStake),
-		stringify.NewStructField("DelegationStake", a.DelegationStake),
-		stringify.NewStructField("FixedCost", a.FixedCost),
-		stringify.NewStructField("StakeEndEpoch", a.StakeEndEpoch),
+		stringify.NewStructField("ValidatorStake", uint64(a.ValidatorStake)),
+		stringify.NewStructField("DelegationStake", uint64(a.DelegationStake)),
+		stringify.NewStructField("FixedCost", uint64(a.FixedCost)),
+		stringify.NewStructField("StakeEndEpoch", uint64(a.StakeEndEpoch)),
 		stringify.NewStructField("LatestSupportedProtocolVersionAndHash", a.LatestSupportedProtocolVersionAndHash),
 	)
 }
diff --git a/pkg/protocol/engine/accounts/credits.go b/pkg/protocol/engine/accounts/credits.go
@@ -26,8 +26,8 @@ func NewBlockIssuanceCredits(value iotago.BlockIssuanceCredits, updateTime iotag
 
 func (c *BlockIssuanceCredits) String() string {
 	return stringify.Struct("BlockIssuanceCredits",
-		stringify.NewStructField("Value", c.Value),
-		stringify.NewStructField("UpdateSlot", c.UpdateSlot),
+		stringify.NewStructField("Value", int64(c.Value)),
+		stringify.NewStructField("UpdateSlot", uint32(c.UpdateSlot)),
 	)
 }
 
diff --git a/pkg/protocol/engine/accounts/mana.go b/pkg/protocol/engine/accounts/mana.go
@@ -49,8 +49,8 @@ func (m *Mana) String() string {
 	defer m.mutex.RUnlock()
 
 	return stringify.Struct("Mana",
-		stringify.NewStructField("Value", m.value),
-		stringify.NewStructField("ExcessBaseTokens", m.excessBaseTokens),
-		stringify.NewStructField("UpdateTime", m.updateTime),
+		stringify.NewStructField("Value", uint64(m.value)),
+		stringify.NewStructField("ExcessBaseTokens", uint64(m.excessBaseTokens)),
+		stringify.NewStructField("UpdateTime", uint32(m.updateTime)),
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ func (p *PoolsStats) Bytes() ([]byte, error) {`
`62`	`62`
`63`	`63`	`func (p *PoolsStats) String() string {`
`64`	`64`	`return stringify.Struct("PoolsStats",`
`65`		`- stringify.NewStructField("TotalStake", p.TotalStake),`
`66`		`- stringify.NewStructField("TotalValidatorStake", p.TotalValidatorStake),`
	`65`	`+ stringify.NewStructField("TotalStake", uint64(p.TotalStake)),`
	`66`	`+ stringify.NewStructField("TotalValidatorStake", uint64(p.TotalValidatorStake)),`
`67`	`67`	`stringify.NewStructField("ProfitMargin", p.ProfitMargin),`
`68`	`68`	`)`
`69`	`69`	`}`
`@@ -123,8 +123,8 @@ func (p *PoolRewards) Bytes() ([]byte, error) {`
`123`	`123`
`124`	`124`	`func (p *PoolRewards) String() string {`
`125`	`125`	`return stringify.Struct("PoolRewards",`
`126`		`- stringify.NewStructField("PoolStake", p.PoolStake),`
`127`		`- stringify.NewStructField("PoolRewards", p.PoolRewards),`
`128`		`- stringify.NewStructField("FixedCost", p.FixedCost),`
	`126`	`+ stringify.NewStructField("PoolStake", uint64(p.PoolStake)),`
	`127`	`+ stringify.NewStructField("PoolRewards", uint64(p.PoolRewards)),`
	`128`	`+ stringify.NewStructField("FixedCost", uint64(p.FixedCost)),`
`129`	`129`	`)`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func VersionAndHashFromBytes(bytes []byte) (VersionAndHash, int, error) {`
`36`	`36`
`37`	`37`	`func (v VersionAndHash) String() string {`
`38`	`38`	`return stringify.Struct("VersionAndHash",`
`39`		`- stringify.NewStructField("Version", v.Version),`
	`39`	`+ stringify.NewStructField("Version", byte(v.Version)),`
`40`	`40`	`stringify.NewStructField("Hash", v.Hash),`
`41`	`41`	`)`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ func NewBlockIssuanceCredits(value iotago.BlockIssuanceCredits, updateTime iotag`
`26`	`26`
`27`	`27`	`func (c *BlockIssuanceCredits) String() string {`
`28`	`28`	`return stringify.Struct("BlockIssuanceCredits",`
`29`		`- stringify.NewStructField("Value", c.Value),`
`30`		`- stringify.NewStructField("UpdateSlot", c.UpdateSlot),`
	`29`	`+ stringify.NewStructField("Value", int64(c.Value)),`
	`30`	`+ stringify.NewStructField("UpdateSlot", uint32(c.UpdateSlot)),`
`31`	`31`	`)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ func (m *Mana) String() string {`
`49`	`49`	`defer m.mutex.RUnlock()`
`50`	`50`
`51`	`51`	`return stringify.Struct("Mana",`
`52`		`- stringify.NewStructField("Value", m.value),`
`53`		`- stringify.NewStructField("ExcessBaseTokens", m.excessBaseTokens),`
`54`		`- stringify.NewStructField("UpdateTime", m.updateTime),`
	`52`	`+ stringify.NewStructField("Value", uint64(m.value)),`
	`53`	`+ stringify.NewStructField("ExcessBaseTokens", uint64(m.excessBaseTokens)),`
	`54`	`+ stringify.NewStructField("UpdateTime", uint32(m.updateTime)),`
`55`	`55`	`)`
`56`	`56`	`}`