forked from TrueCloudLab/frostfs-node
[#338] ir: Drop container notaryless code
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
parent
03ab0ca30f
commit
fb708b3a2d
5 changed files with 66 additions and 121 deletions
|
|
@ -7,7 +7,6 @@ import (
|
|||
"time"
|
||||
|
||||
containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
|
||||
cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||
containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container"
|
||||
|
|
@ -22,6 +21,7 @@ import (
|
|||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
|
||||
"github.com/nspcc-dev/neo-go/pkg/core/transaction"
|
||||
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
||||
"github.com/nspcc-dev/neo-go/pkg/network/payload"
|
||||
"github.com/nspcc-dev/neo-go/pkg/util"
|
||||
|
|
@ -34,18 +34,16 @@ func TestPutEvent(t *testing.T) {
|
|||
homHashDisabled: true,
|
||||
epoch: 100,
|
||||
}
|
||||
cc := &testContainerClient{
|
||||
get: make(map[string]*containercore.Container),
|
||||
}
|
||||
mc := &testMorphClient{}
|
||||
|
||||
proc, err := New(&Params{
|
||||
Log: test.NewLogger(t, true),
|
||||
PoolSize: 2,
|
||||
AlphabetState: &testAlphabetState{isAlphabet: true},
|
||||
FrostFSIDClient: &testIDClient{},
|
||||
NotaryDisabled: true,
|
||||
NetworkState: nst,
|
||||
ContainerClient: cc,
|
||||
ContainerClient: &testContainerClient{},
|
||||
MorphClient: mc,
|
||||
})
|
||||
require.NoError(t, err, "failed to create processor")
|
||||
|
||||
|
|
@ -64,10 +62,15 @@ func TestPutEvent(t *testing.T) {
|
|||
cnr.SetBasicACL(acl.Private)
|
||||
containerSDK.DisableHomomorphicHashing(&cnr)
|
||||
|
||||
nr := &payload.P2PNotaryRequest{
|
||||
MainTransaction: &transaction.Transaction{},
|
||||
}
|
||||
|
||||
event := &testPutEvent{
|
||||
cnr: &cnr,
|
||||
pk: p,
|
||||
st: nil,
|
||||
nr: nr,
|
||||
}
|
||||
|
||||
proc.handlePut(event)
|
||||
|
|
@ -76,13 +79,7 @@ func TestPutEvent(t *testing.T) {
|
|||
time.Sleep(10 * time.Millisecond)
|
||||
}
|
||||
|
||||
var expectedPut cntClient.PutPrm
|
||||
expectedPut.SetContainer(cnr.Marshal())
|
||||
expectedPut.SetKey(p.PublicKey().Bytes())
|
||||
expectedPut.SetSignature(p.Sign(cnr.Marshal()))
|
||||
expectedPut.SetZone("container")
|
||||
|
||||
require.EqualValues(t, []cntClient.PutPrm{expectedPut}, cc.put, "invalid put requests")
|
||||
require.EqualValues(t, []*transaction.Transaction{nr.MainTransaction}, mc.transactions, "invalid notary requests")
|
||||
}
|
||||
|
||||
func TestDeleteEvent(t *testing.T) {
|
||||
|
|
@ -103,15 +100,16 @@ func TestDeleteEvent(t *testing.T) {
|
|||
p.PublicKey(),
|
||||
},
|
||||
}
|
||||
mc := &testMorphClient{}
|
||||
|
||||
proc, err := New(&Params{
|
||||
Log: test.NewLogger(t, true),
|
||||
PoolSize: 2,
|
||||
AlphabetState: &testAlphabetState{isAlphabet: true},
|
||||
FrostFSIDClient: idc,
|
||||
NotaryDisabled: true,
|
||||
NetworkState: nst,
|
||||
ContainerClient: cc,
|
||||
MorphClient: mc,
|
||||
})
|
||||
require.NoError(t, err, "failed to create processor")
|
||||
|
||||
|
|
@ -133,9 +131,14 @@ func TestDeleteEvent(t *testing.T) {
|
|||
cidBin := make([]byte, 32)
|
||||
cid.Encode(cidBin)
|
||||
|
||||
nr := &payload.P2PNotaryRequest{
|
||||
MainTransaction: &transaction.Transaction{},
|
||||
}
|
||||
|
||||
ev := containerEvent.Delete{
|
||||
ContainerIDValue: cidBin,
|
||||
SignatureValue: p.Sign(cidBin),
|
||||
ContainerIDValue: cidBin,
|
||||
SignatureValue: p.Sign(cidBin),
|
||||
NotaryRequestValue: nr,
|
||||
}
|
||||
|
||||
var signature frostfscrypto.Signature
|
||||
|
|
@ -156,7 +159,7 @@ func TestDeleteEvent(t *testing.T) {
|
|||
expectedDelete.SetCID(ev.ContainerID())
|
||||
expectedDelete.SetSignature(ev.Signature())
|
||||
|
||||
require.EqualValues(t, []cntClient.DeletePrm{expectedDelete}, cc.delete, "invalid delete requests")
|
||||
require.EqualValues(t, []*transaction.Transaction{nr.MainTransaction}, mc.transactions, "invalid notary requests")
|
||||
}
|
||||
|
||||
func TestSetEACLEvent(t *testing.T) {
|
||||
|
|
@ -168,15 +171,16 @@ func TestSetEACLEvent(t *testing.T) {
|
|||
cc := &testContainerClient{
|
||||
get: make(map[string]*containercore.Container),
|
||||
}
|
||||
mc := &testMorphClient{}
|
||||
|
||||
proc, err := New(&Params{
|
||||
Log: test.NewLogger(t, true),
|
||||
PoolSize: 2,
|
||||
AlphabetState: &testAlphabetState{isAlphabet: true},
|
||||
FrostFSIDClient: &testIDClient{},
|
||||
NotaryDisabled: true,
|
||||
NetworkState: nst,
|
||||
ContainerClient: cc,
|
||||
MorphClient: mc,
|
||||
})
|
||||
require.NoError(t, err, "failed to create processor")
|
||||
|
||||
|
|
@ -219,10 +223,14 @@ func TestSetEACLEvent(t *testing.T) {
|
|||
|
||||
table.AddRecord(r)
|
||||
|
||||
nr := &payload.P2PNotaryRequest{
|
||||
MainTransaction: &transaction.Transaction{},
|
||||
}
|
||||
event := containerEvent.SetEACL{
|
||||
TableValue: table.ToV2().StableMarshal(nil),
|
||||
PublicKeyValue: p.PublicKey().Bytes(),
|
||||
SignatureValue: p.Sign(table.ToV2().StableMarshal(nil)),
|
||||
TableValue: table.ToV2().StableMarshal(nil),
|
||||
PublicKeyValue: p.PublicKey().Bytes(),
|
||||
SignatureValue: p.Sign(table.ToV2().StableMarshal(nil)),
|
||||
NotaryRequestValue: nr,
|
||||
}
|
||||
|
||||
proc.handleSetEACL(event)
|
||||
|
|
@ -236,7 +244,7 @@ func TestSetEACLEvent(t *testing.T) {
|
|||
expectedPutEACL.SetKey(p.PublicKey().Bytes())
|
||||
expectedPutEACL.SetSignature(p.Sign(table.ToV2().StableMarshal(nil)))
|
||||
|
||||
require.EqualValues(t, []cntClient.PutEACLPrm{expectedPutEACL}, cc.putEACL, "invalid set EACL requests")
|
||||
require.EqualValues(t, []*transaction.Transaction{nr.MainTransaction}, mc.transactions, "invalid notary requests")
|
||||
}
|
||||
|
||||
type testAlphabetState struct {
|
||||
|
|
@ -262,25 +270,13 @@ func (s *testNetworkState) Epoch() (uint64, error) {
|
|||
|
||||
type testContainerClient struct {
|
||||
contractAddress util.Uint160
|
||||
put []cntClient.PutPrm
|
||||
get map[string]*containercore.Container
|
||||
delete []cntClient.DeletePrm
|
||||
putEACL []cntClient.PutEACLPrm
|
||||
}
|
||||
|
||||
func (c *testContainerClient) ContractAddress() util.Uint160 {
|
||||
return c.contractAddress
|
||||
}
|
||||
|
||||
func (c *testContainerClient) Morph() *client.Client {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *testContainerClient) Put(p cntClient.PutPrm) error {
|
||||
c.put = append(c.put, p)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *testContainerClient) Get(cid []byte) (*containercore.Container, error) {
|
||||
key := hex.EncodeToString(cid)
|
||||
if cont, found := c.get[key]; found {
|
||||
|
|
@ -289,16 +285,6 @@ func (c *testContainerClient) Get(cid []byte) (*containercore.Container, error)
|
|||
return nil, apistatus.ContainerNotFound{}
|
||||
}
|
||||
|
||||
func (c *testContainerClient) Delete(p cntClient.DeletePrm) error {
|
||||
c.delete = append(c.delete, p)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *testContainerClient) PutEACL(p cntClient.PutEACLPrm) error {
|
||||
c.putEACL = append(c.putEACL, p)
|
||||
return nil
|
||||
}
|
||||
|
||||
type testIDClient struct {
|
||||
publicKeys keys.PublicKeys
|
||||
}
|
||||
|
|
@ -313,6 +299,7 @@ type testPutEvent struct {
|
|||
cnr *containerSDK.Container
|
||||
pk *keys.PrivateKey
|
||||
st []byte
|
||||
nr *payload.P2PNotaryRequest
|
||||
}
|
||||
|
||||
func (e *testPutEvent) MorphEvent() {}
|
||||
|
|
@ -333,5 +320,14 @@ func (e *testPutEvent) SessionToken() []byte {
|
|||
return e.st
|
||||
}
|
||||
func (e *testPutEvent) NotaryRequest() *payload.P2PNotaryRequest {
|
||||
return e.nr
|
||||
}
|
||||
|
||||
type testMorphClient struct {
|
||||
transactions []*transaction.Transaction
|
||||
}
|
||||
|
||||
func (c *testMorphClient) NotarySignAndInvokeTX(mainTx *transaction.Transaction) error {
|
||||
c.transactions = append(c.transactions, mainTx)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue