Skip to content

Commit

Permalink
remove comments; fix integration test errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicksinch
nicksinch committed Nov 24, 2023
1 parent cbde41d commit 35b1f25
Show file tree
Hide file tree
Showing 21 changed files with 35 additions and 186 deletions.
Binary file modified build/runtime.wasm
View file
Binary file not shown.
7 changes: 3 additions & 4 deletions frame/system/extensions/check_genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ type CheckGenesis struct {
}

func NewCheckGenesis(module system.Module) primitives.SignedExtension {
return &CheckGenesis{module: module,
additionalSignedData: sc.VaryingData{
primitives.H256{},
}}
return &CheckGenesis{
module: module,
additionalSignedData: sc.NewVaryingData(primitives.H256{})}
}

func (cg CheckGenesis) Encode(*bytes.Buffer) error {
Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_genesis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,21 +123,6 @@ func Test_CheckGenesis_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckGenesis_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckGenesis,
// "CheckGenesis",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_genesis", "CheckGenesis"},
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckGenesis", metadata.CheckGenesis, metadata.TypesH256)
//
// resultType, resultSignedExtension := setupCheckGenesis().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckGenesis() CheckGenesis {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckGenesis(mockModule).(*CheckGenesis)
Expand Down
5 changes: 2 additions & 3 deletions frame/system/extensions/check_mortality.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ type CheckMortality struct {
}

func NewCheckMortality(systemModule system.Module) primitives.SignedExtension {
return &CheckMortality{systemModule: systemModule, additionalSignedData: sc.VaryingData{
primitives.H256{},
}}
return &CheckMortality{systemModule: systemModule,
additionalSignedData: sc.NewVaryingData(primitives.H256{})}
}

func (cm CheckMortality) Encode(buffer *bytes.Buffer) error {
Expand Down
19 changes: 0 additions & 19 deletions frame/system/extensions/check_mortality_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,25 +218,6 @@ func Test_CheckMortality_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckMortality_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckMortality,
// "CheckMortality",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_mortality", "CheckMortality"},
// primitives.NewMetadataTypeDefinitionComposite(
// sc.Sequence[primitives.MetadataTypeDefinitionField]{
// primitives.NewMetadataTypeDefinitionFieldWithName(metadata.TypesEra, "Era"),
// },
// ),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckMortality", metadata.CheckMortality, metadata.TypesH256)
//
// resultType, resultSignedExtension := setupCheckMortality().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckMortality() CheckMortality {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckMortality(mockModule).(*CheckMortality)
Expand Down
2 changes: 1 addition & 1 deletion frame/system/extensions/check_non_zero_sender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type CheckNonZeroAddress struct {

func NewCheckNonZeroAddress() primitives.SignedExtension {
return &CheckNonZeroAddress{
additionalSignedData: sc.VaryingData{},
additionalSignedData: sc.NewVaryingData(),
}
}

Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_non_zero_sender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,6 @@ func Test_CheckNonZeroAddress_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckNonZeroAddress_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckNonZeroSender,
// "CheckNonZeroSender",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_non_zero_sender", "CheckNonZeroSender"},
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckNonZeroSender", metadata.CheckNonZeroSender, metadata.TypesEmptyTuple)
//
// resultType, resultSignedExtension := setupCheckNonZeroSender().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckNonZeroSender() CheckNonZeroAddress {
extension, ok := NewCheckNonZeroAddress().(*CheckNonZeroAddress)
if !ok {
Expand Down
2 changes: 1 addition & 1 deletion frame/system/extensions/check_nonce.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type CheckNonce struct {
func NewCheckNonce(systemModule system.Module) primitives.SignedExtension {
return &CheckNonce{
systemModule: systemModule,
additionalSignedData: sc.VaryingData{},
additionalSignedData: sc.NewVaryingData(),
}
}

Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_nonce_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,21 +275,6 @@ func Test_CheckNonce_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckNonce_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckNonce,
// "CheckNonce",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_nonce", "CheckNonce"},
// primitives.NewMetadataTypeDefinitionCompact(sc.ToCompact(metadata.PrimitiveTypesU32)),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckNonce", metadata.CheckNonce, metadata.TypesEmptyTuple)
//
// resultType, resultSignedExtension := setupCheckNonce().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckNonce() CheckNonce {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckNonce(mockModule).(*CheckNonce)
Expand Down
6 changes: 2 additions & 4 deletions frame/system/extensions/check_spec_version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ type CheckSpecVersion struct {

func NewCheckSpecVersion(systemModule system.Module) primitives.SignedExtension {
return &CheckSpecVersion{
systemModule: systemModule,
additionalSignedData: sc.VaryingData{
sc.U32(0),
},
systemModule: systemModule,
additionalSignedData: sc.NewVaryingData(sc.U32(0)),
}
}

Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_spec_version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,6 @@ func Test_CheckSpecVersion_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckSpecVersion_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckSpecVersion,
// "CheckSpecVersion",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_spec_version", "CheckSpecVersion"},
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckSpecVersion", metadata.CheckSpecVersion, metadata.PrimitiveTypesU32)
//
// resultType, resultSignedExtension := setupCheckSpecVersion().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckSpecVersion() CheckSpecVersion {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckSpecVersion(mockModule).(*CheckSpecVersion)
Expand Down
6 changes: 2 additions & 4 deletions frame/system/extensions/check_tx_version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ type CheckTxVersion struct {

func NewCheckTxVersion(module system.Module) primitives.SignedExtension {
return &CheckTxVersion{
systemModule: module,
additionalSignedData: sc.VaryingData{
sc.U32(0),
},
systemModule: module,
additionalSignedData: sc.NewVaryingData(sc.U32(0)),
}
}

Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_tx_version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,6 @@ func Test_CheckTxVersion_PostDispatch(t *testing.T) {
assert.Nil(t, err)
}

//func Test_CheckTxVersion_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckTxVersion,
// "CheckTxVersion",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_tx_version", "CheckTxVersion"},
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckTxVersion", metadata.CheckTxVersion, metadata.PrimitiveTypesU32)
//
// resultType, resultSignedExtension := setupCheckTxVersion().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckTxVersion() CheckTxVersion {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckTxVersion(mockModule).(*CheckTxVersion)
Expand Down
2 changes: 1 addition & 1 deletion frame/system/extensions/check_weight.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type CheckWeight struct {
func NewCheckWeight(systemModule system.Module) primitives.SignedExtension {
return &CheckWeight{
systemModule: systemModule,
additionalSignedData: sc.VaryingData{},
additionalSignedData: sc.NewVaryingData(),
}
}

Expand Down
15 changes: 0 additions & 15 deletions frame/system/extensions/check_weight_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,21 +701,6 @@ func Test_CheckWeight_calculateConsumedWeight_MaxTotal_Success(t *testing.T) {
assert.Equal(t, expect, result)
}

//func Test_CheckWeight_Metadata(t *testing.T) {
// expectType := primitives.NewMetadataTypeWithPath(
// metadata.CheckWeight,
// "CheckWeight",
// sc.Sequence[sc.Str]{"frame_system", "extensions", "check_weight", "CheckWeight"},
// primitives.NewMetadataTypeDefinitionComposite(sc.Sequence[primitives.MetadataTypeDefinitionField]{}),
// )
// expectSignedExtension := primitives.NewMetadataSignedExtension("CheckWeight", metadata.CheckWeight, metadata.TypesEmptyTuple)
//
// resultType, resultSignedExtension := setupCheckWeight().Metadata()
//
// assert.Equal(t, expectType, resultType)
// assert.Equal(t, expectSignedExtension, resultSignedExtension)
//}

func setupCheckWeight() CheckWeight {
mockModule = new(mocks.SystemModule)
extension, ok := NewCheckWeight(mockModule).(*CheckWeight)
Expand Down
25 changes: 0 additions & 25 deletions frame/transaction_payment/extensions/charge_transaction_payment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,31 +329,6 @@ func Test_PreDispatchUnsigned(t *testing.T) {
assert.Nil(t, err)
}

//func Test_Metadata(t *testing.T) {
// setup(txFee)
//
// metadataType, metadataSignedExtension := targetChargeTxPayment.Metadata()
//
// expectedMetadataType := types.NewMetadataTypeWithParam(
// metadata.ChargeTransactionPayment,
// "ChargeTransactionPayment",
// sc.Sequence[sc.Str]{"pallet_transaction_payment", "ChargeTransactionPayment"},
// types.NewMetadataTypeDefinitionComposite(
// sc.Sequence[types.MetadataTypeDefinitionField]{
// types.NewMetadataTypeDefinitionFieldWithName(metadata.TypesCompactU128, "BalanceOf<T>"),
// },
// ),
// types.NewMetadataEmptyTypeParameter("T"),
// )
//
// expectedMetadataSignedExtension := types.NewMetadataSignedExtension(
// "ChargeTransactionPayment", metadata.ChargeTransactionPayment, metadata.TypesEmptyTuple,
// )
//
// assert.Equal(t, expectedMetadataType, metadataType)
// assert.Equal(t, expectedMetadataSignedExtension, metadataSignedExtension)
//}

func Test_getPriority(t *testing.T) {
setup(txFee)

Expand Down
7 changes: 5 additions & 2 deletions primitives/types/extra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
const (
additionalSignedTypeName = "additionalSignedData"
moduleTypeName = "Module"
varyingDataType = "VaryingData"
)

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

typeName := t.Name()

typeNumFields := t.NumField()
typeNumFields := 0

if t.Kind() == reflect.Struct {
typeNumFields = t.NumField()
}

for i := 0; i < typeNumFields; i++ {
fieldName := t.Field(i).Name
Expand Down
12 changes: 6 additions & 6 deletions primitives/types/testExtraCheckComplex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,31 @@ func (e *testExtraCheckComplex) Decode(buffer *bytes.Buffer) error {
return nil

Check warning on line 34 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L33-L34 

Added lines #L33 - L34 were not covered by tests
}

func (e testExtraCheckComplex) AdditionalSigned() (AdditionalSigned, TransactionValidityError) {
func (e testExtraCheckComplex) AdditionalSigned() (AdditionalSigned, error) {
return sc.NewVaryingData(H256{}, sc.U32(0), sc.U64(0), H512{}, Ed25519PublicKey{}), nil

Check warning on line 38 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L37-L38 

Added lines #L37 - L38 were not covered by tests
}

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

return validTransaction, nil

Check warning on line 45 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L41-L45 

Added lines #L41 - L45 were not covered by tests
}

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

Check warning on line 49 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L48-L49 

Added lines #L48 - L49 were not covered by tests
}

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

Check warning on line 54 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L52-L54 

Added lines #L52 - L54 were not covered by tests
}

func (e testExtraCheckComplex) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) TransactionValidityError {
func (e testExtraCheckComplex) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) error {
_, err := e.ValidateUnsigned(call, info, length)
return err

Check warning on line 59 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L57-L59 

Added lines #L57 - L59 were not covered by tests
}

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

Check warning on line 63 in primitives/types/testExtraCheckComplex.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckComplex.go#L62-L63 

Added lines #L62 - L63 were not covered by tests
}
12 changes: 6 additions & 6 deletions primitives/types/testExtraCheckEmpty.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,31 @@ func (e *testExtraCheckEmpty) Decode(buffer *bytes.Buffer) error {
return nil

Check warning on line 28 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L27-L28 

Added lines #L27 - L28 were not covered by tests
}

func (e testExtraCheckEmpty) AdditionalSigned() (AdditionalSigned, TransactionValidityError) {
func (e testExtraCheckEmpty) AdditionalSigned() (AdditionalSigned, error) {
return sc.NewVaryingData(), nil

Check warning on line 32 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L31-L32 

Added lines #L31 - L32 were not covered by tests
}

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

return validTransaction, nil

Check warning on line 39 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L35-L39 

Added lines #L35 - L39 were not covered by tests
}

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

Check warning on line 43 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L42-L43 

Added lines #L42 - L43 were not covered by tests
}

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

Check warning on line 48 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L46-L48 

Added lines #L46 - L48 were not covered by tests
}

func (e testExtraCheckEmpty) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) TransactionValidityError {
func (e testExtraCheckEmpty) PreDispatchUnsigned(call Call, info *DispatchInfo, length sc.Compact) error {
_, err := e.ValidateUnsigned(call, info, length)
return err

Check warning on line 53 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L51-L53 

Added lines #L51 - L53 were not covered by tests
}

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

Check warning on line 57 in primitives/types/testExtraCheckEmpty.go

View check run for this annotation

Codecov / codecov/patch

primitives/types/testExtraCheckEmpty.go#L56-L57 

Added lines #L56 - L57 were not covered by tests
}
Loading

0 comments on commit 35b1f25

Please sign in to comment.