dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #2991 from nspcc-dev/revert-mgmt-ids

Browse source 
Revert "native: make management compatible with C# node 3.5.0"
This commit is contained in:
Roman Khimov 2023-04-25 12:42:01 +03:00 committed by GitHub
commit bbdfdc3099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/core/blockchain.go
View file

@ -2228,14 +2228,6 @@ func (bc *Blockchain) GetContractState(hash util.Uint160) *state.Contract {
// GetContractScriptHash returns contract script hash by its ID. // GetContractScriptHash returns contract script hash by its ID.
func (bc *Blockchain) GetContractScriptHash(id int32) (util.Uint160, error) { func (bc *Blockchain) GetContractScriptHash(id int32) (util.Uint160, error) {
if id < 0 {
for _, n := range bc.contracts.Contracts {
nc := n.Metadata().NativeContract
if nc.ID == id {
return nc.Hash, nil
}
}
}
return native.GetContractScriptHash(bc.dao, id) return native.GetContractScriptHash(bc.dao, id)
} }

6
pkg/core/native/management.go
View file

@ -688,10 +688,8 @@ func putContractState(d *dao.Simple, cs *state.Contract, updateCache bool) error
if cs.UpdateCounter != 0 { // Update. if cs.UpdateCounter != 0 { // Update.
return nil return nil
} }
if cs.ID > 0 { key = putHashKey(key, cs.ID)
key = putHashKey(key, cs.ID) d.PutStorageItem(ManagementContractID, key, cs.Hash.BytesBE())
d.PutStorageItem(ManagementContractID, key, cs.Hash.BytesBE())
}
return nil return nil
} }

2
pkg/core/native/native_test/management_test.go
View file

@ -566,7 +566,6 @@ func TestManagement_GetContract(t *testing.T) {
t.Run("by ID, positive", func(t *testing.T) { t.Run("by ID, positive", func(t *testing.T) {
managementInvoker.Invoke(t, si, "getContractById", cs1.ID) managementInvoker.Invoke(t, si, "getContractById", cs1.ID)
}) })
/* C# compatibility
t.Run("by ID, native", func(t *testing.T) { t.Run("by ID, native", func(t *testing.T) {
csm := managementInvoker.Executor.Chain.GetContractState(managementInvoker.Hash) csm := managementInvoker.Executor.Chain.GetContractState(managementInvoker.Hash)
require.NotNil(t, csm) require.NotNil(t, csm)
@ -574,7 +573,6 @@ func TestManagement_GetContract(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
managementInvoker.Invoke(t, sim, "getContractById", -1) managementInvoker.Invoke(t, sim, "getContractById", -1)
}) })
*/
t.Run("by ID, empty", func(t *testing.T) { t.Run("by ID, empty", func(t *testing.T) {
managementInvoker.Invoke(t, stackitem.Null{}, "getContractById", -100) managementInvoker.Invoke(t, stackitem.Null{}, "getContractById", -100)
}) })

3
pkg/services/rpcsrv/client_test.go
View file

@ -261,11 +261,10 @@ func TestClientManagementContract(t *testing.T) {
cs2, err := c.GetContractStateByHash(gas.Hash) cs2, err := c.GetContractStateByHash(gas.Hash)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, cs2, cs1) require.Equal(t, cs2, cs1)
/* C# compat
cs1, err = manReader.GetContractByID(-6) cs1, err = manReader.GetContractByID(-6)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, cs2, cs1) require.Equal(t, cs2, cs1)
*/
ret, err := manReader.HasMethod(gas.Hash, "transfer", 4) ret, err := manReader.HasMethod(gas.Hash, "transfer", 4)
require.NoError(t, err) require.NoError(t, err)
require.True(t, ret) require.True(t, ret)

2
pkg/services/rpcsrv/server_test.go
View file

@ -83,7 +83,7 @@ const (
faultedTxHashLE = "82279bfe9bada282ca0f8cb8e0bb124b921af36f00c69a518320322c6f4fef60" faultedTxHashLE = "82279bfe9bada282ca0f8cb8e0bb124b921af36f00c69a518320322c6f4fef60"
faultedTxBlock uint32 = 23 faultedTxBlock uint32 = 23
invokescriptContractAVM = "VwIADBQBDAMOBQYMDQIODw0DDgcJAAAAAErZMCQE2zBwaEH4J+yMqiYEEUAMFA0PAwIJAAIBAwcDBAUCAQAOBgwJStkwJATbMHFpQfgn7IyqJgQSQBNA" invokescriptContractAVM = "VwIADBQBDAMOBQYMDQIODw0DDgcJAAAAAErZMCQE2zBwaEH4J+yMqiYEEUAMFA0PAwIJAAIBAwcDBAUCAQAOBgwJStkwJATbMHFpQfgn7IyqJgQSQBNA"
block20StateRootLE = "a2841baec40c6b752ba959c2b2cfee20b6beeabb85460224929bc9ff358bf8d2" block20StateRootLE = "ae445869283f8d7e0debc3f455014c73cde21b9802db99e80248da9f393bce14"
) )
var ( var (