diff --git a/cmd/gossamer/config_test.go b/cmd/gossamer/config_test.go index f3fd944716..b69f482045 100644 --- a/cmd/gossamer/config_test.go +++ b/cmd/gossamer/config_test.go @@ -845,7 +845,7 @@ func TestGlobalNodeName_WhenNodeAlreadyHasStoredName(t *testing.T) { cfg := newTestConfig(t, westendDevConfig) cfg.Global.Name = globalName - runtimeFilePath, err := runtime.GetRuntime(context.Background(), runtime.NODE_RUNTIME) + runtimeFilePath, err := runtime.GetRuntime(context.Background(), runtime.WESTEND_RUNTIME_v0929) require.NoError(t, err) runtimeData, err := os.ReadFile(runtimeFilePath) require.NoError(t, err) diff --git a/dot/core/service_integration_test.go b/dot/core/service_integration_test.go index 6ecad4b10a..99034cc2aa 100644 --- a/dot/core/service_integration_test.go +++ b/dot/core/service_integration_test.go @@ -288,7 +288,7 @@ func TestHandleChainReorg_WithReorg_Transactions(t *testing.T) { t.Skip() // need to update this test to use a valid transaction cfg := &Config{ - Runtime: wasmer.NewTestInstance(t, runtime.NODE_RUNTIME), + Runtime: wasmer.NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929), } s := NewTestService(t, cfg) diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go index e5cb2b3ae7..3afd95f0c9 100644 --- a/dot/node_integration_test.go +++ b/dot/node_integration_test.go @@ -458,7 +458,7 @@ func TestNode_PersistGlobalName_WhenInitialize(t *testing.T) { // newTestGenesisAndRuntime create a new test runtime and a new test genesis // file with the test runtime stored in raw data and returns the genesis file func newTestGenesisAndRuntime(t *testing.T) (filename string) { - runtimeFilePath, err := runtime.GetRuntime(context.Background(), runtime.NODE_RUNTIME) + runtimeFilePath, err := runtime.GetRuntime(context.Background(), runtime.WESTEND_RUNTIME_v0929) require.NoError(t, err) runtimeData, err := os.ReadFile(runtimeFilePath) require.NoError(t, err) diff --git a/dot/rpc/modules/dev_integration_test.go b/dot/rpc/modules/dev_integration_test.go index 42083e1a07..b8d365a3e8 100644 --- a/dot/rpc/modules/dev_integration_test.go +++ b/dot/rpc/modules/dev_integration_test.go @@ -57,7 +57,7 @@ func newBABEService(t *testing.T) *babe.Service { bs, es := newState(t) tt := trie.NewEmptyTrie() - rt := wasmer.NewTestInstanceWithTrie(t, runtime.NODE_RUNTIME, tt) + rt := wasmer.NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt) bs.StoreRuntime(bs.GenesisHash(), rt) tt.Put( common.MustHexToBytes("0x886726f904d8372fdabb7707870c2fad"), diff --git a/dot/rpc/modules/state_integration_test.go b/dot/rpc/modules/state_integration_test.go index 2cf8383310..fb94a47480 100644 --- a/dot/rpc/modules/state_integration_test.go +++ b/dot/rpc/modules/state_integration_test.go @@ -30,27 +30,30 @@ const ( func TestStateModule_GetRuntimeVersion(t *testing.T) { // expected results based on responses from prior tests expected := StateRuntimeVersionResponse{ - SpecName: "node", - ImplName: "substrate-node", - AuthoringVersion: 10, - SpecVersion: 264, + SpecName: "westend", + ImplName: "parity-westend", + AuthoringVersion: 2, + SpecVersion: 9290, ImplVersion: 0, Apis: []interface{}{ - []interface{}{"0xdf6acb689907609b", uint32(3)}, + []interface{}{"0xdf6acb689907609b", uint32(4)}, []interface{}{"0x37e397fc7c91f5e4", uint32(1)}, - []interface{}{"0x40fe3ad401f8959a", uint32(4)}, - []interface{}{"0xd2bc9897eed08f15", uint32(2)}, + []interface{}{"0x40fe3ad401f8959a", uint32(6)}, + []interface{}{"0xd2bc9897eed08f15", uint32(3)}, []interface{}{"0xf78b278be53f454c", uint32(2)}, - []interface{}{"0xed99c5acb25eedf5", uint32(2)}, + []interface{}{"0xaf2c0297a23e6d3d", uint32(2)}, + []interface{}{"0x49eaaf1b548a0cb0", uint32(1)}, + []interface{}{"0x91d5df18b0d2cf58", uint32(1)}, + []interface{}{"0xed99c5acb25eedf5", uint32(3)}, []interface{}{"0xcbca25e39f142387", uint32(2)}, []interface{}{"0x687ad44ad37f03c2", uint32(1)}, + []interface{}{"0xab3c0572291feb8b", uint32(1)}, []interface{}{"0xbc9d89904f5b923f", uint32(1)}, - []interface{}{"0x68b66ba122c93fa7", uint32(1)}, []interface{}{"0x37c8bb1350a9a2a8", uint32(1)}, - []interface{}{"0x91d5df18b0d2cf58", uint32(1)}, - []interface{}{"0xab3c0572291feb8b", uint32(1)}, + []interface{}{"0xf3ff14d5ab527059", uint32(1)}, + []interface{}{"0x17a6bc0d0062aeb3", uint32(1)}, }, - TransactionVersion: 2, + TransactionVersion: 12, } sm, hash, _ := setupStateModule(t) diff --git a/dot/rpc/modules/system_integration_test.go b/dot/rpc/modules/system_integration_test.go index 3f2be61d69..aab4313fb3 100644 --- a/dot/rpc/modules/system_integration_test.go +++ b/dot/rpc/modules/system_integration_test.go @@ -354,7 +354,7 @@ func setupSystemModule(t *testing.T) *SystemModule { func newCoreService(t *testing.T, srvc *state.Service) *core.Service { // setup service tt := trie.NewEmptyTrie() - rt := wasmer.NewTestInstanceWithTrie(t, runtime.NODE_RUNTIME, tt) + rt := wasmer.NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt) ks := keystore.NewGlobalKeystore() t.Cleanup(func() { rt.Stop() diff --git a/lib/runtime/constants.go b/lib/runtime/constants.go index 8a73adc26d..efc064ca2e 100644 --- a/lib/runtime/constants.go +++ b/lib/runtime/constants.go @@ -5,16 +5,6 @@ package runtime //nolint:revive const ( - // v0.9 substrate runtime - NODE_RUNTIME = "node_runtime" - NODE_RUNTIME_FP = "node_runtime.compact.wasm" - NODE_RUNTIME_URL = "https://github.com/noot/substrate/blob/noot/v0.9/target/debug/wbuild/node-runtime/node_runtime.compact.wasm?raw=true" //nolint:lll - - // v0.9.8 substrate runtime - NODE_RUNTIME_v098 = "node_runtime-v0.9.8" - NODE_RUNTIME_FP_v098 = "node_runtime-v0.9.8.compact.wasm" - NODE_RUNTIME_URL_v098 = "https://github.com/noot/substrate/blob/noot/v0.9.8/target/debug/wbuild/node-runtime/node_runtime.compact.wasm?raw=true" //nolint:lll - // v0.9.10 polkadot runtime POLKADOT_RUNTIME_v0910 = "polkadot_runtime-v9100" POLKADOT_RUNTIME_FP_v0910 = "polkadot_runtime-v9100.compact.wasm" diff --git a/lib/runtime/test_helpers.go b/lib/runtime/test_helpers.go index e9aea6bcb5..898bce4898 100644 --- a/lib/runtime/test_helpers.go +++ b/lib/runtime/test_helpers.go @@ -74,12 +74,6 @@ func GetRuntime(ctx context.Context, runtime string) ( var runtimeFilename, url string switch runtime { - case NODE_RUNTIME: - runtimeFilename = NODE_RUNTIME_FP - url = NODE_RUNTIME_URL - case NODE_RUNTIME_v098: - runtimeFilename = NODE_RUNTIME_FP_v098 - url = NODE_RUNTIME_URL_v098 case POLKADOT_RUNTIME_v0925: runtimeFilename = POLKADOT_RUNTIME_FP_v0925 url = POLKADOT_RUNTIME_URL_v0925 diff --git a/lib/runtime/wasmer/exports_test.go b/lib/runtime/wasmer/exports_test.go index af70fdab6e..e9d5ba96be 100644 --- a/lib/runtime/wasmer/exports_test.go +++ b/lib/runtime/wasmer/exports_test.go @@ -70,62 +70,6 @@ func Test_Instance_Version(t *testing.T) { TransactionVersion: 1, }, }, - "node_v098": { - instanceBuilder: func(t *testing.T) instanceVersioner { - return NewTestInstance(t, runtime.NODE_RUNTIME_v098) - }, - expectedVersion: runtime.Version{ - SpecName: []byte("node"), - ImplName: []byte("substrate-node"), - AuthoringVersion: 10, - SpecVersion: 267, - ImplVersion: 0, - APIItems: []runtime.APIItem{ - {Name: [8]uint8{0xdf, 0x6a, 0xcb, 0x68, 0x99, 0x7, 0x60, 0x9b}, Ver: 0x3}, - {Name: [8]uint8{0x37, 0xe3, 0x97, 0xfc, 0x7c, 0x91, 0xf5, 0xe4}, Ver: 0x1}, - {Name: [8]uint8{0x40, 0xfe, 0x3a, 0xd4, 0x1, 0xf8, 0x95, 0x9a}, Ver: 0x5}, - {Name: [8]uint8{0xd2, 0xbc, 0x98, 0x97, 0xee, 0xd0, 0x8f, 0x15}, Ver: 0x2}, - {Name: [8]uint8{0xf7, 0x8b, 0x27, 0x8b, 0xe5, 0x3f, 0x45, 0x4c}, Ver: 0x2}, - {Name: [8]uint8{0xed, 0x99, 0xc5, 0xac, 0xb2, 0x5e, 0xed, 0xf5}, Ver: 0x2}, - {Name: [8]uint8{0xcb, 0xca, 0x25, 0xe3, 0x9f, 0x14, 0x23, 0x87}, Ver: 0x2}, - {Name: [8]uint8{0x68, 0x7a, 0xd4, 0x4a, 0xd3, 0x7f, 0x3, 0xc2}, Ver: 0x1}, - {Name: [8]uint8{0xbc, 0x9d, 0x89, 0x90, 0x4f, 0x5b, 0x92, 0x3f}, Ver: 0x1}, - {Name: [8]uint8{0x68, 0xb6, 0x6b, 0xa1, 0x22, 0xc9, 0x3f, 0xa7}, Ver: 0x1}, - {Name: [8]uint8{0x37, 0xc8, 0xbb, 0x13, 0x50, 0xa9, 0xa2, 0xa8}, Ver: 0x1}, - {Name: [8]uint8{0x91, 0xd5, 0xdf, 0x18, 0xb0, 0xd2, 0xcf, 0x58}, Ver: 0x1}, - {Name: [8]uint8{0xab, 0x3c, 0x5, 0x72, 0x29, 0x1f, 0xeb, 0x8b}, Ver: 0x1}, - }, - TransactionVersion: 2, - }, - }, - "node": { - instanceBuilder: func(t *testing.T) instanceVersioner { - return NewTestInstance(t, runtime.NODE_RUNTIME) - }, - expectedVersion: runtime.Version{ - SpecName: []byte("node"), - ImplName: []byte("substrate-node"), - AuthoringVersion: 10, - SpecVersion: 264, - ImplVersion: 0, - APIItems: []runtime.APIItem{ - {Name: [8]uint8{0xdf, 0x6a, 0xcb, 0x68, 0x99, 0x7, 0x60, 0x9b}, Ver: 0x3}, - {Name: [8]uint8{0x37, 0xe3, 0x97, 0xfc, 0x7c, 0x91, 0xf5, 0xe4}, Ver: 0x1}, - {Name: [8]uint8{0x40, 0xfe, 0x3a, 0xd4, 0x1, 0xf8, 0x95, 0x9a}, Ver: 0x4}, - {Name: [8]uint8{0xd2, 0xbc, 0x98, 0x97, 0xee, 0xd0, 0x8f, 0x15}, Ver: 0x2}, - {Name: [8]uint8{0xf7, 0x8b, 0x27, 0x8b, 0xe5, 0x3f, 0x45, 0x4c}, Ver: 0x2}, - {Name: [8]uint8{0xed, 0x99, 0xc5, 0xac, 0xb2, 0x5e, 0xed, 0xf5}, Ver: 0x2}, - {Name: [8]uint8{0xcb, 0xca, 0x25, 0xe3, 0x9f, 0x14, 0x23, 0x87}, Ver: 0x2}, - {Name: [8]uint8{0x68, 0x7a, 0xd4, 0x4a, 0xd3, 0x7f, 0x3, 0xc2}, Ver: 0x1}, - {Name: [8]uint8{0xbc, 0x9d, 0x89, 0x90, 0x4f, 0x5b, 0x92, 0x3f}, Ver: 0x1}, - {Name: [8]uint8{0x68, 0xb6, 0x6b, 0xa1, 0x22, 0xc9, 0x3f, 0xa7}, Ver: 0x1}, - {Name: [8]uint8{0x37, 0xc8, 0xbb, 0x13, 0x50, 0xa9, 0xa2, 0xa8}, Ver: 0x1}, - {Name: [8]uint8{0x91, 0xd5, 0xdf, 0x18, 0xb0, 0xd2, 0xcf, 0x58}, Ver: 0x1}, - {Name: [8]uint8{0xab, 0x3c, 0x5, 0x72, 0x29, 0x1f, 0xeb, 0x8b}, Ver: 0x1}, - }, - TransactionVersion: 2, - }, - }, "kusama": { instanceBuilder: func(t *testing.T) instanceVersioner { genesisPath := utils.GetKusamaGenesisPath(t) @@ -220,48 +164,49 @@ func Test_Instance_Version(t *testing.T) { TransactionVersion: 8, }, }, - "runtime_v0980": { + "polkadot_v0917": { instanceBuilder: func(t *testing.T) instanceVersioner { - return NewTestInstance(t, runtime.NODE_RUNTIME_v098) + return NewTestInstance(t, runtime.POLKADOT_RUNTIME_v0917) }, expectedVersion: runtime.Version{ - SpecName: []byte("node"), - ImplName: []byte("substrate-node"), - AuthoringVersion: 10, - SpecVersion: 267, + SpecName: []byte("polkadot"), + ImplName: []byte("parity-polkadot"), + AuthoringVersion: 0, + SpecVersion: 9170, ImplVersion: 0, APIItems: []runtime.APIItem{ - {Name: [8]uint8{0xdf, 0x6a, 0xcb, 0x68, 0x99, 0x7, 0x60, 0x9b}, Ver: 0x3}, + {Name: [8]uint8{0xdf, 0x6a, 0xcb, 0x68, 0x99, 0x7, 0x60, 0x9b}, Ver: 0x4}, {Name: [8]uint8{0x37, 0xe3, 0x97, 0xfc, 0x7c, 0x91, 0xf5, 0xe4}, Ver: 0x1}, {Name: [8]uint8{0x40, 0xfe, 0x3a, 0xd4, 0x1, 0xf8, 0x95, 0x9a}, Ver: 0x5}, - {Name: [8]uint8{0xd2, 0xbc, 0x98, 0x97, 0xee, 0xd0, 0x8f, 0x15}, Ver: 0x2}, + {Name: [8]uint8{0xd2, 0xbc, 0x98, 0x97, 0xee, 0xd0, 0x8f, 0x15}, Ver: 0x3}, {Name: [8]uint8{0xf7, 0x8b, 0x27, 0x8b, 0xe5, 0x3f, 0x45, 0x4c}, Ver: 0x2}, - {Name: [8]uint8{0xed, 0x99, 0xc5, 0xac, 0xb2, 0x5e, 0xed, 0xf5}, Ver: 0x2}, + {Name: [8]uint8{0xaf, 0x2c, 0x2, 0x97, 0xa2, 0x3e, 0x6d, 0x3d}, Ver: 0x2}, + {Name: [8]uint8{0x49, 0xea, 0xaf, 0x1b, 0x54, 0x8a, 0xc, 0xb0}, Ver: 0x1}, + {Name: [8]uint8{0x91, 0xd5, 0xdf, 0x18, 0xb0, 0xd2, 0xcf, 0x58}, Ver: 0x1}, + {Name: [8]uint8{0xed, 0x99, 0xc5, 0xac, 0xb2, 0x5e, 0xed, 0xf5}, Ver: 0x3}, {Name: [8]uint8{0xcb, 0xca, 0x25, 0xe3, 0x9f, 0x14, 0x23, 0x87}, Ver: 0x2}, {Name: [8]uint8{0x68, 0x7a, 0xd4, 0x4a, 0xd3, 0x7f, 0x3, 0xc2}, Ver: 0x1}, + {Name: [8]uint8{0xab, 0x3c, 0x5, 0x72, 0x29, 0x1f, 0xeb, 0x8b}, Ver: 0x1}, {Name: [8]uint8{0xbc, 0x9d, 0x89, 0x90, 0x4f, 0x5b, 0x92, 0x3f}, Ver: 0x1}, - {Name: [8]uint8{0x68, 0xb6, 0x6b, 0xa1, 0x22, 0xc9, 0x3f, 0xa7}, Ver: 0x1}, {Name: [8]uint8{0x37, 0xc8, 0xbb, 0x13, 0x50, 0xa9, 0xa2, 0xa8}, Ver: 0x1}, - {Name: [8]uint8{0x91, 0xd5, 0xdf, 0x18, 0xb0, 0xd2, 0xcf, 0x58}, Ver: 0x1}, - {Name: [8]uint8{0xab, 0x3c, 0x5, 0x72, 0x29, 0x1f, 0xeb, 0x8b}, Ver: 0x1}, }, - TransactionVersion: 2, + TransactionVersion: 11, }, }, - "polkadot_v0917": { + "westend_v0929": { instanceBuilder: func(t *testing.T) instanceVersioner { - return NewTestInstance(t, runtime.POLKADOT_RUNTIME_v0917) + return NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) }, expectedVersion: runtime.Version{ - SpecName: []byte("polkadot"), - ImplName: []byte("parity-polkadot"), - AuthoringVersion: 0, - SpecVersion: 9170, + SpecName: []byte("westend"), + ImplName: []byte("parity-westend"), + AuthoringVersion: 2, + SpecVersion: 9290, ImplVersion: 0, APIItems: []runtime.APIItem{ {Name: [8]uint8{0xdf, 0x6a, 0xcb, 0x68, 0x99, 0x7, 0x60, 0x9b}, Ver: 0x4}, {Name: [8]uint8{0x37, 0xe3, 0x97, 0xfc, 0x7c, 0x91, 0xf5, 0xe4}, Ver: 0x1}, - {Name: [8]uint8{0x40, 0xfe, 0x3a, 0xd4, 0x1, 0xf8, 0x95, 0x9a}, Ver: 0x5}, + {Name: [8]uint8{0x40, 0xfe, 0x3a, 0xd4, 0x1, 0xf8, 0x95, 0x9a}, Ver: 0x6}, {Name: [8]uint8{0xd2, 0xbc, 0x98, 0x97, 0xee, 0xd0, 0x8f, 0x15}, Ver: 0x3}, {Name: [8]uint8{0xf7, 0x8b, 0x27, 0x8b, 0xe5, 0x3f, 0x45, 0x4c}, Ver: 0x2}, {Name: [8]uint8{0xaf, 0x2c, 0x2, 0x97, 0xa2, 0x3e, 0x6d, 0x3d}, Ver: 0x2}, @@ -273,8 +218,10 @@ func Test_Instance_Version(t *testing.T) { {Name: [8]uint8{0xab, 0x3c, 0x5, 0x72, 0x29, 0x1f, 0xeb, 0x8b}, Ver: 0x1}, {Name: [8]uint8{0xbc, 0x9d, 0x89, 0x90, 0x4f, 0x5b, 0x92, 0x3f}, Ver: 0x1}, {Name: [8]uint8{0x37, 0xc8, 0xbb, 0x13, 0x50, 0xa9, 0xa2, 0xa8}, Ver: 0x1}, + {Name: [8]uint8{0xf3, 0xff, 0x14, 0xd5, 0xab, 0x52, 0x70, 0x59}, Ver: 0x1}, + {Name: [8]uint8{0x17, 0xa6, 0xbc, 0xd, 0x0, 0x62, 0xae, 0xb3}, Ver: 0x1}, }, - TransactionVersion: 11, + TransactionVersion: 12, }, }, } @@ -373,7 +320,7 @@ func TestInstance_GrandpaAuthorities_NodeRuntime(t *testing.T) { key := common.MustHexToBytes(genesis.GrandpaAuthoritiesKeyHex) tt.Put(key, value) - rt := NewTestInstanceWithTrie(t, runtime.NODE_RUNTIME, tt) + rt := NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt) auths, err := rt.GrandpaAuthorities() require.NoError(t, err) @@ -509,19 +456,19 @@ func TestInstance_BabeSubmitReportEquivocationUnsignedExtrinsic(t *testing.T) { } } -func TestInstance_BabeConfiguration_NodeRuntime_NoAuthorities(t *testing.T) { - rt := NewTestInstance(t, runtime.NODE_RUNTIME) +func TestInstance_BabeConfiguration_WestendRuntime_NoAuthorities(t *testing.T) { + rt := NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) cfg, err := rt.BabeConfiguration() require.NoError(t, err) expected := &types.BabeConfiguration{ - SlotDuration: 3000, - EpochLength: 200, + SlotDuration: 6000, + EpochLength: 600, C1: 1, - C2: 2, + C2: 4, GenesisAuthorities: nil, Randomness: [32]byte{}, - SecondarySlots: 1, + SecondarySlots: 2, } require.Equal(t, expected, cfg) } @@ -544,7 +491,7 @@ func TestInstance_BabeConfiguration_DevRuntime_NoAuthorities(t *testing.T) { require.Equal(t, expected, cfg) } -func TestInstance_BabeConfiguration_NodeRuntime_WithAuthorities(t *testing.T) { +func TestInstance_BabeConfiguration_WestendRuntime_WithAuthorities(t *testing.T) { tt := trie.NewEmptyTrie() randomnessValue, err := common.HexToHash("0x01") @@ -558,7 +505,7 @@ func TestInstance_BabeConfiguration_NodeRuntime_WithAuthorities(t *testing.T) { key = common.MustHexToBytes(genesis.BABEAuthoritiesKeyHex) tt.Put(key, authorityValue) - rt := NewTestInstanceWithTrie(t, runtime.NODE_RUNTIME, tt) + rt := NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt) cfg, err := rt.BabeConfiguration() require.NoError(t, err) @@ -572,20 +519,20 @@ func TestInstance_BabeConfiguration_NodeRuntime_WithAuthorities(t *testing.T) { } expected := &types.BabeConfiguration{ - SlotDuration: 3000, - EpochLength: 200, + SlotDuration: 6000, + EpochLength: 600, C1: 1, - C2: 2, + C2: 4, GenesisAuthorities: expectedAuthData, Randomness: [32]byte{1}, - SecondarySlots: 1, + SecondarySlots: 2, } require.Equal(t, expected, cfg) } func TestInstance_InitializeBlock_NodeRuntime(t *testing.T) { - rt := NewTestInstance(t, runtime.NODE_RUNTIME) + rt := NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) header := &types.Header{ Number: 1, @@ -1052,14 +999,14 @@ func TestInstance_ExecuteBlock_PolkadotBlock1089328(t *testing.T) { } func TestInstance_DecodeSessionKeys(t *testing.T) { - keys := "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d34309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc38520426026" //nolint:lll + keys := "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d34309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc3852042602634309a9d2a24213896ff06895db16aade8b6502f3a71cf56374cc38520426026" //nolint:lll pubkeys, err := common.HexToBytes(keys) require.NoError(t, err) pukeysBytes, err := scale.Marshal(pubkeys) require.NoError(t, err) - instance := NewTestInstance(t, runtime.NODE_RUNTIME_v098) + instance := NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) decoded, err := instance.DecodeSessionKeys(pukeysBytes) require.NoError(t, err) @@ -1071,7 +1018,8 @@ func TestInstance_DecodeSessionKeys(t *testing.T) { err = scale.Unmarshal(decoded, &decodedKeys) require.NoError(t, err) - require.Len(t, *decodedKeys, 4) + require.NotNil(t, decodedKeys) + require.Len(t, *decodedKeys, 6) } func TestInstance_PaymentQueryInfo(t *testing.T) { @@ -1085,11 +1033,11 @@ func TestInstance_PaymentQueryInfo(t *testing.T) { // Was made with @polkadot/api on https://github.com/danforbes/polkadot-js-scripts/tree/create-signed-tx ext: "0xd1018400d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d01bc2b6e35929aabd5b8bc4e5b0168c9bee59e2bb9d6098769f6683ecf73e44c776652d947a270d59f3d37eb9f9c8c17ec1b4cc473f2f9928ffdeef0f3abd43e85d502000000012844616e20466f72626573", //nolint:lll expect: &types.RuntimeDispatchInfo{ - Weight: 1973000, + Weight: 0, Class: 0, PartialFee: &scale.Uint128{ Upper: 0, - Lower: uint64(1180126973000), + Lower: uint64(12800000000), }, }, }, @@ -1118,7 +1066,7 @@ func TestInstance_PaymentQueryInfo(t *testing.T) { require.NoError(t, err) } - ins := NewTestInstance(t, runtime.NODE_RUNTIME) + ins := NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) info, err := ins.PaymentQueryInfo(extBytes) if test.errMessage != "" { diff --git a/lib/runtime/wasmer/instance_test.go b/lib/runtime/wasmer/instance_test.go index dd1e22686b..fb46898793 100644 --- a/lib/runtime/wasmer/instance_test.go +++ b/lib/runtime/wasmer/instance_test.go @@ -16,7 +16,7 @@ import ( // test used for ensuring runtime exec calls can me made concurrently func TestConcurrentRuntimeCalls(t *testing.T) { - instance := NewTestInstance(t, runtime.NODE_RUNTIME) + instance := NewTestInstance(t, runtime.WESTEND_RUNTIME_v0929) // execute 2 concurrent calls to the runtime go func() {