Commit 1e202d1c authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 46b8b4f7
...@@ -67,8 +67,8 @@ package proto ...@@ -67,8 +67,8 @@ package proto
// TODO work this out // TODO work this out
import ( import (
"lab.nexedi.com/kirr/neo/go/zodb"
"lab.nexedi.com/kirr/go123/mem" "lab.nexedi.com/kirr/go123/mem"
"lab.nexedi.com/kirr/neo/go/zodb"
"lab.nexedi.com/kirr/neo/go/internal/packed" "lab.nexedi.com/kirr/neo/go/internal/packed"
...@@ -93,7 +93,6 @@ const ( ...@@ -93,7 +93,6 @@ const (
// answerBit is set in message code in answer messages for compatibility with neo/py // answerBit is set in message code in answer messages for compatibility with neo/py
answerBit = 0x8000 answerBit = 0x8000
//INVALID_UUID UUID = 0 //INVALID_UUID UUID = 0
// XXX -> zodb? // XXX -> zodb?
...@@ -383,10 +382,10 @@ type AcceptIdentification struct { ...@@ -383,10 +382,10 @@ type AcceptIdentification struct {
} }
// Check if a peer is still alive. Any -> Any. // Check if a peer is still alive. Any -> Any.
type Ping struct {} type Ping struct{}
//neo:proto answer //neo:proto answer
type Pong struct {} type Pong struct{}
// Tell peer it can close the connection if it has finished with us. Any -> Any // Tell peer it can close the connection if it has finished with us. Any -> Any
type CloseClient struct { type CloseClient struct {
...@@ -477,14 +476,14 @@ type StopOperation struct { ...@@ -477,14 +476,14 @@ type StopOperation struct {
// Ask unfinished transactions S -> PM. // Ask unfinished transactions S -> PM.
// Answer unfinished transactions PM -> S. // Answer unfinished transactions PM -> S.
type UnfinishedTransactions struct { type UnfinishedTransactions struct {
RowList []struct{ RowList []struct {
Offset uint32 // PNumber XXX -> Pid Offset uint32 // PNumber XXX -> Pid
} }
} }
type AnswerUnfinishedTransactions struct { type AnswerUnfinishedTransactions struct {
MaxTID zodb.Tid MaxTID zodb.Tid
TidList []struct{ TidList []struct {
UnfinishedTID zodb.Tid UnfinishedTID zodb.Tid
} }
} }
...@@ -650,7 +649,7 @@ type StoreTransaction struct { ...@@ -650,7 +649,7 @@ type StoreTransaction struct {
OidList []zodb.Oid OidList []zodb.Oid
} }
type AnswerStoreTransaction struct {} type AnswerStoreTransaction struct{}
// Ask to store a transaction. C -> S. // Ask to store a transaction. C -> S.
// Answer if transaction has been stored. S -> C. // Answer if transaction has been stored. S -> C.
...@@ -658,7 +657,7 @@ type VoteTransaction struct { ...@@ -658,7 +657,7 @@ type VoteTransaction struct {
Tid zodb.Tid Tid zodb.Tid
} }
type AnswerVoteTransaction struct {} type AnswerVoteTransaction struct{}
// Ask a stored object by its OID and a serial or a TID if given. If a serial // Ask a stored object by its OID and a serial or a TID if given. If a serial
// is specified, the specified revision of an object will be returned. If // is specified, the specified revision of an object will be returned. If
......
...@@ -32,7 +32,7 @@ import ( ...@@ -32,7 +32,7 @@ import (
// verify that message codes are the same in between py and go. // verify that message codes are the same in between py and go.
func TestMsgCodeVsPy(t *testing.T) { func TestMsgCodeVsPy(t *testing.T) {
goMsgRegistry := map[uint16]string{} // code -> packet name goMsgRegistry := map[uint16]string{} // code -> packet name
for code, pktType := range msgTypeRegistry{ for code, pktType := range msgTypeRegistry {
goMsgRegistry[code] = pktType.Name() goMsgRegistry[code] = pktType.Name()
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment