Skip to content

Commit 1148291

Browse files
nicksinchnicksinch
committed
remove comments; fix integration test errors
1 parent cbde41d commit 1148291

20 files changed

+35
-161
lines changed

‎build/runtime.wasm

3.43 KB
Binary file not shown.

‎frame/system/extensions/check_genesis.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ type CheckGenesis struct {
1414
}
1515

1616
func NewCheckGenesis(module system.Module) primitives.SignedExtension {
17-
return &CheckGenesis{module: module,
18-
additionalSignedData: sc.VaryingData{
19-
primitives.H256{},
20-
}}
17+
return &CheckGenesis{
18+
module: module,
19+
additionalSignedData: sc.NewVaryingData(primitives.H256{})}
2120
}
2221

2322
func (cg CheckGenesis) Encode(*bytes.Buffer) error {

‎frame/system/extensions/check_genesis_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,6 @@ func Test_CheckGenesis_PostDispatch(t *testing.T) {
123123
assert.Nil(t, err)
124124
}
125125

126-
//func Test_CheckGenesis_Metadata(t *testing.T) {
127-
// expectType := primitives.NewMetadataTypeWithPath(
128-
// metadata.CheckGenesis,
129-
// "CheckGenesis",
130-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_genesis", "CheckGenesis"},
131-
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
132-
// )
133-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckGenesis", metadata.CheckGenesis, metadata.TypesH256)
134-
//
135-
// resultType, resultSignedExtension := setupCheckGenesis().Metadata()
136-
//
137-
// assert.Equal(t, expectType, resultType)
138-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
139-
//}
140-
141126
func setupCheckGenesis() CheckGenesis {
142127
mockModule = new(mocks.SystemModule)
143128
extension, ok := NewCheckGenesis(mockModule).(*CheckGenesis)

‎frame/system/extensions/check_mortality.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ type CheckMortality struct {
1616
}
1717

1818
func NewCheckMortality(systemModule system.Module) primitives.SignedExtension {
19-
return &CheckMortality{systemModule: systemModule, additionalSignedData: sc.VaryingData{
20-
primitives.H256{},
21-
}}
19+
return &CheckMortality{systemModule: systemModule,
20+
additionalSignedData: sc.NewVaryingData(primitives.H256{})}
2221
}
2322

2423
func (cm CheckMortality) Encode(buffer *bytes.Buffer) error {

‎frame/system/extensions/check_mortality_test.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -218,25 +218,6 @@ func Test_CheckMortality_PostDispatch(t *testing.T) {
218218
assert.Nil(t, err)
219219
}
220220

221-
//func Test_CheckMortality_Metadata(t *testing.T) {
222-
// expectType := primitives.NewMetadataTypeWithPath(
223-
// metadata.CheckMortality,
224-
// "CheckMortality",
225-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_mortality", "CheckMortality"},
226-
// primitives.NewMetadataTypeDefinitionComposite(
227-
// sc.Sequence[primitives.MetadataTypeDefinitionField]{
228-
// primitives.NewMetadataTypeDefinitionFieldWithName(metadata.TypesEra, "Era"),
229-
// },
230-
// ),
231-
// )
232-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckMortality", metadata.CheckMortality, metadata.TypesH256)
233-
//
234-
// resultType, resultSignedExtension := setupCheckMortality().Metadata()
235-
//
236-
// assert.Equal(t, expectType, resultType)
237-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
238-
//}
239-
240221
func setupCheckMortality() CheckMortality {
241222
mockModule = new(mocks.SystemModule)
242223
extension, ok := NewCheckMortality(mockModule).(*CheckMortality)

‎frame/system/extensions/check_non_zero_sender.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type CheckNonZeroAddress struct {
1515

1616
func NewCheckNonZeroAddress() primitives.SignedExtension {
1717
return &CheckNonZeroAddress{
18-
additionalSignedData: sc.VaryingData{},
18+
additionalSignedData: sc.NewVaryingData(),
1919
}
2020
}
2121

‎frame/system/extensions/check_non_zero_sender_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,6 @@ func Test_CheckNonZeroAddress_PostDispatch(t *testing.T) {
105105
assert.Nil(t, err)
106106
}
107107

108-
//func Test_CheckNonZeroAddress_Metadata(t *testing.T) {
109-
// expectType := primitives.NewMetadataTypeWithPath(
110-
// metadata.CheckNonZeroSender,
111-
// "CheckNonZeroSender",
112-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_non_zero_sender", "CheckNonZeroSender"},
113-
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
114-
// )
115-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckNonZeroSender", metadata.CheckNonZeroSender, metadata.TypesEmptyTuple)
116-
//
117-
// resultType, resultSignedExtension := setupCheckNonZeroSender().Metadata()
118-
//
119-
// assert.Equal(t, expectType, resultType)
120-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
121-
//}
122-
123108
func setupCheckNonZeroSender() CheckNonZeroAddress {
124109
extension, ok := NewCheckNonZeroAddress().(*CheckNonZeroAddress)
125110
if !ok {

‎frame/system/extensions/check_nonce.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type CheckNonce struct {
1818
func NewCheckNonce(systemModule system.Module) primitives.SignedExtension {
1919
return &CheckNonce{
2020
systemModule: systemModule,
21-
additionalSignedData: sc.VaryingData{},
21+
additionalSignedData: sc.NewVaryingData(),
2222
}
2323
}
2424

‎frame/system/extensions/check_nonce_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -275,21 +275,6 @@ func Test_CheckNonce_PostDispatch(t *testing.T) {
275275
assert.Nil(t, err)
276276
}
277277

278-
//func Test_CheckNonce_Metadata(t *testing.T) {
279-
// expectType := primitives.NewMetadataTypeWithPath(
280-
// metadata.CheckNonce,
281-
// "CheckNonce",
282-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_nonce", "CheckNonce"},
283-
// primitives.NewMetadataTypeDefinitionCompact(sc.ToCompact(metadata.PrimitiveTypesU32)),
284-
// )
285-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckNonce", metadata.CheckNonce, metadata.TypesEmptyTuple)
286-
//
287-
// resultType, resultSignedExtension := setupCheckNonce().Metadata()
288-
//
289-
// assert.Equal(t, expectType, resultType)
290-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
291-
//}
292-
293278
func setupCheckNonce() CheckNonce {
294279
mockModule = new(mocks.SystemModule)
295280
extension, ok := NewCheckNonce(mockModule).(*CheckNonce)

‎frame/system/extensions/check_spec_version.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ type CheckSpecVersion struct {
1515

1616
func NewCheckSpecVersion(systemModule system.Module) primitives.SignedExtension {
1717
return &CheckSpecVersion{
18-
systemModule: systemModule,
19-
additionalSignedData: sc.VaryingData{
20-
sc.U32(0),
21-
},
18+
systemModule: systemModule,
19+
additionalSignedData: sc.NewVaryingData(sc.U32(0)),
2220
}
2321
}
2422

‎frame/system/extensions/check_spec_version_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,6 @@ func Test_CheckSpecVersion_PostDispatch(t *testing.T) {
9999
assert.Nil(t, err)
100100
}
101101

102-
//func Test_CheckSpecVersion_Metadata(t *testing.T) {
103-
// expectType := primitives.NewMetadataTypeWithPath(
104-
// metadata.CheckSpecVersion,
105-
// "CheckSpecVersion",
106-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_spec_version", "CheckSpecVersion"},
107-
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
108-
// )
109-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckSpecVersion", metadata.CheckSpecVersion, metadata.PrimitiveTypesU32)
110-
//
111-
// resultType, resultSignedExtension := setupCheckSpecVersion().Metadata()
112-
//
113-
// assert.Equal(t, expectType, resultType)
114-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
115-
//}
116-
117102
func setupCheckSpecVersion() CheckSpecVersion {
118103
mockModule = new(mocks.SystemModule)
119104
extension, ok := NewCheckSpecVersion(mockModule).(*CheckSpecVersion)

‎frame/system/extensions/check_tx_version.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ type CheckTxVersion struct {
1515

1616
func NewCheckTxVersion(module system.Module) primitives.SignedExtension {
1717
return &CheckTxVersion{
18-
systemModule: module,
19-
additionalSignedData: sc.VaryingData{
20-
sc.U32(0),
21-
},
18+
systemModule: module,
19+
additionalSignedData: sc.NewVaryingData(sc.U32(0)),
2220
}
2321
}
2422

‎frame/system/extensions/check_tx_version_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,6 @@ func Test_CheckTxVersion_PostDispatch(t *testing.T) {
9999
assert.Nil(t, err)
100100
}
101101

102-
//func Test_CheckTxVersion_Metadata(t *testing.T) {
103-
// expectType := primitives.NewMetadataTypeWithPath(
104-
// metadata.CheckTxVersion,
105-
// "CheckTxVersion",
106-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_tx_version", "CheckTxVersion"},
107-
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
108-
// )
109-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckTxVersion", metadata.CheckTxVersion, metadata.PrimitiveTypesU32)
110-
//
111-
// resultType, resultSignedExtension := setupCheckTxVersion().Metadata()
112-
//
113-
// assert.Equal(t, expectType, resultType)
114-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
115-
//}
116-
117102
func setupCheckTxVersion() CheckTxVersion {
118103
mockModule = new(mocks.SystemModule)
119104
extension, ok := NewCheckTxVersion(mockModule).(*CheckTxVersion)

‎frame/system/extensions/check_weight.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type CheckWeight struct {
2121
func NewCheckWeight(systemModule system.Module) primitives.SignedExtension {
2222
return &CheckWeight{
2323
systemModule: systemModule,
24-
additionalSignedData: sc.VaryingData{},
24+
additionalSignedData: sc.NewVaryingData(),
2525
}
2626
}
2727

‎frame/system/extensions/check_weight_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -701,21 +701,6 @@ func Test_CheckWeight_calculateConsumedWeight_MaxTotal_Success(t *testing.T) {
701701
assert.Equal(t, expect, result)
702702
}
703703

704-
//func Test_CheckWeight_Metadata(t *testing.T) {
705-
// expectType := primitives.NewMetadataTypeWithPath(
706-
// metadata.CheckWeight,
707-
// "CheckWeight",
708-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_weight", "CheckWeight"},
709-
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
710-
// )
711-
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckWeight", metadata.CheckWeight, metadata.TypesEmptyTuple)
712-
//
713-
// resultType, resultSignedExtension := setupCheckWeight().Metadata()
714-
//
715-
// assert.Equal(t, expectType, resultType)
716-
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
717-
//}
718-
719704
func setupCheckWeight() CheckWeight {
720705
mockModule = new(mocks.SystemModule)
721706
extension, ok := NewCheckWeight(mockModule).(*CheckWeight)

‎primitives/types/extra.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
const (
1313
additionalSignedTypeName = "additionalSignedData"
1414
moduleTypeName = "Module"
15-
varyingDataType = "VaryingData"
1615
)
1716

1817
type SignedExtra interface {
@@ -242,7 +241,11 @@ func generateNewType(id int, t reflect.Type) MetadataType {
242241

243242
typeName := t.Name()
244243

245-
typeNumFields := t.NumField()
244+
typeNumFields := 0
245+
246+
if t.Kind() == reflect.Struct {
247+
typeNumFields = t.NumField()
248+
}
246249

247250
for i := 0; i < typeNumFields; i++ {
248251
fieldName := t.Field(i).Name

‎primitives/types/testExtraCheckComplex.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,31 @@ func (e *testExtraCheckComplex) Decode(buffer *bytes.Buffer) error {
3434
return nil
3535
}
3636

37-
func (e testExtraCheckComplex) AdditionalSigned() (AdditionalSigned, TransactionValidityError) {
37+
func (e testExtraCheckComplex) AdditionalSigned() (AdditionalSigned, error) {
3838
return sc.NewVaryingData(H256{}, sc.U32(0), sc.U64(0), H512{}, Ed25519PublicKey{}), nil
3939
}
4040

41-
func (e testExtraCheckComplex) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
41+
func (e testExtraCheckComplex) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
4242
validTransaction := DefaultValidTransaction()
4343
validTransaction.Priority = 1
4444

4545
return validTransaction, nil
4646
}
4747

48-
func (e testExtraCheckComplex) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
48+
func (e testExtraCheckComplex) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
4949
return e.Validate(AccountId[PublicKey]{}, call, info, length)
5050
}
5151

52-
func (e testExtraCheckComplex) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, TransactionValidityError) {
52+
func (e testExtraCheckComplex) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, error) {
5353
_, err := e.Validate(who, call, info, length)
5454
return Pre{}, err
5555
}
5656

57-
func (e testExtraCheckComplex) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) TransactionValidityError {
57+
func (e testExtraCheckComplex) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) error {
5858
_, err := e.ValidateUnsigned(call, info, length)
5959
return err
6060
}
6161

62-
func (e testExtraCheckComplex) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) TransactionValidityError {
62+
func (e testExtraCheckComplex) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) error {
6363
return nil
6464
}

‎primitives/types/testExtraCheckEmpty.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,31 @@ func (e *testExtraCheckEmpty) Decode(buffer *bytes.Buffer) error {
2828
return nil
2929
}
3030

31-
func (e testExtraCheckEmpty) AdditionalSigned() (AdditionalSigned, TransactionValidityError) {
31+
func (e testExtraCheckEmpty) AdditionalSigned() (AdditionalSigned, error) {
3232
return sc.NewVaryingData(), nil
3333
}
3434

35-
func (e testExtraCheckEmpty) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
35+
func (e testExtraCheckEmpty) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
3636
validTransaction := DefaultValidTransaction()
3737
validTransaction.Priority = 1
3838

3939
return validTransaction, nil
4040
}
4141

42-
func (e testExtraCheckEmpty) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
42+
func (e testExtraCheckEmpty) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
4343
return e.Validate(AccountId[PublicKey]{}, call, info, length)
4444
}
4545

46-
func (e testExtraCheckEmpty) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, TransactionValidityError) {
46+
func (e testExtraCheckEmpty) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, error) {
4747
_, err := e.Validate(who, call, info, length)
4848
return Pre{}, err
4949
}
5050

51-
func (e testExtraCheckEmpty) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) TransactionValidityError {
51+
func (e testExtraCheckEmpty) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) error {
5252
_, err := e.ValidateUnsigned(call, info, length)
5353
return err
5454
}
5555

56-
func (e testExtraCheckEmpty) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) TransactionValidityError {
56+
func (e testExtraCheckEmpty) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) error {
5757
return nil
5858
}

‎primitives/types/testExtraCheckEra.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@ func (e *testExtraCheckEra) Decode(buffer *bytes.Buffer) error {
3131
return nil
3232
}
3333

34-
func (e testExtraCheckEra) AdditionalSigned() (AdditionalSigned, TransactionValidityError) {
34+
func (e testExtraCheckEra) AdditionalSigned() (AdditionalSigned, error) {
3535
return sc.NewVaryingData(H256{}), nil
3636
}
3737

38-
func (e testExtraCheckEra) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
38+
func (e testExtraCheckEra) Validate(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
3939
validTransaction := DefaultValidTransaction()
4040
validTransaction.Priority = 1
4141

4242
return validTransaction, nil
4343
}
4444

45-
func (e testExtraCheckEra) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, TransactionValidityError) {
45+
func (e testExtraCheckEra) ValidateUnsigned(call Call, info *DispatchInfo, length sc.Compact) (ValidTransaction, error) {
4646
return e.Validate(AccountId[PublicKey]{}, call, info, length)
4747
}
4848

49-
func (e testExtraCheckEra) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, TransactionValidityError) {
49+
func (e testExtraCheckEra) PreDispatch(who AccountId[PublicKey], call Call, info *DispatchInfo, length sc.Compact) (Pre, error) {
5050
_, err := e.Validate(who, call, info, length)
5151
return Pre{}, err
5252
}
5353

54-
func (e testExtraCheckEra) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) TransactionValidityError {
54+
func (e testExtraCheckEra) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) error {
5555
_, err := e.ValidateUnsigned(call, info, length)
5656
return err
5757
}
5858

59-
func (e testExtraCheckEra) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) TransactionValidityError {
59+
func (e testExtraCheckEra) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, postInfo *PostDispatchInfo, length sc.Compact, result *DispatchResult) error {
6060
return nil
6161
}

‎primitives/types/testextra_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,3 @@ func (e testExtraCheck) PostDispatch(pre sc.Option[Pre], info *DispatchInfo, pos
8989

9090
return nil
9191
}
92-
93-
//func (e testExtraCheck) Metadata() (MetadataType, MetadataSignedExtension) {
94-
// id := 123456
95-
// typ := 789
96-
// docs := "TestExtraCheck"
97-
//
98-
// return NewMetadataTypeWithPath(
99-
// id,
100-
// docs,
101-
// sc.Sequence[sc.Str]{"frame_system", "extensions", "test_extra_check", "TestExtraCheck"},
102-
// NewMetadataTypeDefinitionCompact(sc.ToCompact(id)),
103-
// ),
104-
// NewMetadataSignedExtension(sc.Str(docs), id, typ)
105-
//}

0 commit comments

Comments
 (0)