Skip to content
Snippets Groups Projects
Commit b04d665a authored by capossele's avatar capossele
Browse files

:heavy_minus_sign: removes old gossip

parent 1ff8046d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 478 deletions
buffstreams @ 20679e9c
Subproject commit 20679e9ca31ad9ff33e5a1c3c4b90ec65e9a0b03
packages/gossip/errors.go deleted 100644 → 0
+ 0
− 11
View file @ 1ff8046d
package gossip
import "errors"
var (
errClosed = errors.New("socket closed")
errSender = errors.New("could not match sender")
errRecipient = errors.New("could not match recipient")
errSignature = errors.New("could not verify signature")
errVersion = errors.New("protocol version not supported")
)
packages/gossip/manager.go deleted 100644 → 0
+ 0
− 4
View file @ 1ff8046d
package gossip
type Manager struct {
}
packages/gossip/neighbors.go deleted 100644 → 0
+ 0
− 9
View file @ 1ff8046d
package gossip
import (
"github.com/iotaledger/autopeering-sim/peer"
)
type Neighbor struct {
peer *peer.Peer
}
packages/gossip/neighbors_test.go deleted 100644 → 0
+ 0
− 126
View file @ 1ff8046d
package gossip
import (
"fmt"
"log"
"strconv"
"testing"
"time"
"github.com/golang/protobuf/proto"
"github.com/iotaledger/goshimmer/packages/gossip/buffstreams"
pb "github.com/iotaledger/goshimmer/packages/gossip/proto"
)
// TestCallback is a simple server for test purposes. It has a single callback,
// which is to unmarshall some data and log it.
func (t *testController) TestCallback(bts []byte) error {
msg := &pb.ConnectionRequest{
// Version: 1,
// From: "client",
// To: "server",
// Timestamp: 1,
}
err := proto.Unmarshal(bts, msg)
if t.enableLogging {
fmt.Println(msg.GetFrom(), msg.GetTo())
}
return err
}
type testController struct {
enableLogging bool
}
func server() {
tc := &testController{
enableLogging: true,
}
cfg := buffstreams.TCPListenerConfig{
MaxMessageSize: 2048,
EnableLogging: tc.enableLogging,
Address: buffstreams.FormatAddress("127.0.0.1", strconv.Itoa(5031)),
Callback: tc.TestCallback,
}
bm := buffstreams.NewManager()
err := bm.StartListening(cfg)
if err != nil {
log.Print(err)
} else {
// Need to block until ctrl+c, but having trouble getting signal trapping to work on OSX...
time.Sleep(time.Second * 2)
fmt.Println(bm.GetConnectionIDs())
}
}
func client() {
cfg := &buffstreams.TCPConnConfig{
MaxMessageSize: 2048,
Address: buffstreams.FormatAddress("127.0.0.1", strconv.Itoa(5031)),
}
msg := &pb.ConnectionRequest{
Version: 1,
From: "client",
To: "server",
Timestamp: 1,
}
msgBytes, err := proto.Marshal(msg)
if err != nil {
log.Print(err)
}
//count := 0
cbm := buffstreams.NewManager()
err = cbm.Dial(cfg)
if err != nil {
log.Fatal(err)
}
btw, err := cbm.Write(cfg.Address, msgBytes)
//btw, err := buffstreams.DialTCP(cfg)
if err != nil {
log.Fatal(btw, err)
}
// currentTime := time.Now()
// lastTime := currentTime
// for {
// _, err := btw.Write(msgBytes)
// if err != nil {
// fmt.Println("There was an error")
// fmt.Println(err)
// }
// count = count + 1
// if lastTime.Second() != currentTime.Second() {
// lastTime = currentTime
// fmt.Printf(", %d\n", count)
// count = 0
// }
// currentTime = time.Now()
// }
}
func TestDummy(t *testing.T) {
// connections = make(map[string]net.Conn)
// makeListener()
// conn, err := net.Dial("tcp", "localhost:8080")
// if err != nil {
// // handle error
// }
// testMessage := new(pb.ConnectionRequest)
// testMessage.Version = 1
// testMessage.From = conn.LocalAddr().String()
// testMessage.To = conn.RemoteAddr().String()
// testMessage.Timestamp = 1
// pkt, err := proto.Marshal(testMessage)
// if err != nil {
// fmt.Println(err)
// }
// n, err := conn.Write(pkt)
// if err != nil {
// fmt.Println(n, err)
// }
// //status, err := bufio.NewReader(conn).ReadString('\n')
// time.Sleep(4 * time.Second)
go server()
go client()
time.Sleep(4 * time.Second)
}
packages/gossip/proto/message.pb.go deleted 100644 → 0
+ 0
− 165
View file @ 1ff8046d
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: packages/gossip/proto/message.proto
package proto
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type ConnectionRequest struct {
// protocol version number
Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
// string form of the return address (e.g. "192.0.2.1:25", "[2001:db8::1]:80")
From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"`
// string form of the recipient address
To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"`
// unix time
Timestamp int64 `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ConnectionRequest) Reset() { *m = ConnectionRequest{} }
func (m *ConnectionRequest) String() string { return proto.CompactTextString(m) }
func (*ConnectionRequest) ProtoMessage() {}
func (*ConnectionRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_fcce9e84825f2fa5, []int{0}
}
func (m *ConnectionRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ConnectionRequest.Unmarshal(m, b)
}
func (m *ConnectionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ConnectionRequest.Marshal(b, m, deterministic)
}
func (m *ConnectionRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_ConnectionRequest.Merge(m, src)
}
func (m *ConnectionRequest) XXX_Size() int {
return xxx_messageInfo_ConnectionRequest.Size(m)
}
func (m *ConnectionRequest) XXX_DiscardUnknown() {
xxx_messageInfo_ConnectionRequest.DiscardUnknown(m)
}
var xxx_messageInfo_ConnectionRequest proto.InternalMessageInfo
func (m *ConnectionRequest) GetVersion() uint32 {
if m != nil {
return m.Version
}
return 0
}
func (m *ConnectionRequest) GetFrom() string {
if m != nil {
return m.From
}
return ""
}
func (m *ConnectionRequest) GetTo() string {
if m != nil {
return m.To
}
return ""
}
func (m *ConnectionRequest) GetTimestamp() int64 {
if m != nil {
return m.Timestamp
}
return 0
}
type SignedConnectionRequest struct {
// data of the request
Request *ConnectionRequest `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
// signature of the request
Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *SignedConnectionRequest) Reset() { *m = SignedConnectionRequest{} }
func (m *SignedConnectionRequest) String() string { return proto.CompactTextString(m) }
func (*SignedConnectionRequest) ProtoMessage() {}
func (*SignedConnectionRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_fcce9e84825f2fa5, []int{1}
}
func (m *SignedConnectionRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_SignedConnectionRequest.Unmarshal(m, b)
}
func (m *SignedConnectionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_SignedConnectionRequest.Marshal(b, m, deterministic)
}
func (m *SignedConnectionRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_SignedConnectionRequest.Merge(m, src)
}
func (m *SignedConnectionRequest) XXX_Size() int {
return xxx_messageInfo_SignedConnectionRequest.Size(m)
}
func (m *SignedConnectionRequest) XXX_DiscardUnknown() {
xxx_messageInfo_SignedConnectionRequest.DiscardUnknown(m)
}
var xxx_messageInfo_SignedConnectionRequest proto.InternalMessageInfo
func (m *SignedConnectionRequest) GetRequest() *ConnectionRequest {
if m != nil {
return m.Request
}
return nil
}
func (m *SignedConnectionRequest) GetSignature() []byte {
if m != nil {
return m.Signature
}
return nil
}
func init() {
proto.RegisterType((*ConnectionRequest)(nil), "proto.ConnectionRequest")
proto.RegisterType((*SignedConnectionRequest)(nil), "proto.SignedConnectionRequest")
}
func init() {
proto.RegisterFile("packages/gossip/proto/message.proto", fileDescriptor_fcce9e84825f2fa5)
}
var fileDescriptor_fcce9e84825f2fa5 = []byte{
// 228 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x50, 0x3d, 0x4f, 0xc3, 0x30,
0x10, 0x55, 0xd2, 0x42, 0x55, 0xf3, 0x21, 0xe1, 0x05, 0x0f, 0x0c, 0x51, 0x59, 0x32, 0xc5, 0x52,
0x11, 0x62, 0x87, 0x7f, 0x60, 0x36, 0x36, 0x37, 0x3d, 0xdc, 0x53, 0xb1, 0x2f, 0xf8, 0x2e, 0xfc,
0x7e, 0x54, 0x57, 0x55, 0x87, 0x74, 0x7a, 0x1f, 0x7a, 0xd2, 0x7b, 0x7a, 0xea, 0x79, 0xf0, 0xfd,
0xde, 0x07, 0x60, 0x1b, 0x88, 0x19, 0x07, 0x3b, 0x64, 0x12, 0xb2, 0x11, 0x98, 0x7d, 0x80, 0xae,
0x28, 0x7d, 0x55, 0x60, 0x45, 0xea, 0xe1, 0x83, 0x52, 0x82, 0x5e, 0x90, 0x92, 0x83, 0xdf, 0x11,
0x58, 0xb4, 0x51, 0x8b, 0x3f, 0xc8, 0x8c, 0x94, 0x4c, 0xd5, 0x54, 0xed, 0x9d, 0x3b, 0x49, 0xad,
0xd5, 0xfc, 0x3b, 0x53, 0x34, 0x75, 0x53, 0xb5, 0x4b, 0x57, 0xb8, 0xbe, 0x57, 0xb5, 0x90, 0x99,
0x15, 0xa7, 0x16, 0xd2, 0x4f, 0x6a, 0x29, 0x18, 0x81, 0xc5, 0xc7, 0xc1, 0xcc, 0x9b, 0xaa, 0x9d,
0xb9, 0xb3, 0xb1, 0xda, 0xab, 0xc7, 0x4f, 0x0c, 0x09, 0xb6, 0xd3, 0xda, 0xb5, 0x5a, 0xe4, 0x23,
0x2d, 0xb5, 0x37, 0x6b, 0x73, 0xdc, 0xda, 0x4d, 0xa2, 0xee, 0x14, 0x3c, 0x94, 0x31, 0x86, 0xe4,
0x65, 0xcc, 0x50, 0x56, 0xdd, 0xba, 0xb3, 0xf1, 0xfe, 0xf6, 0xf5, 0x1a, 0x50, 0x76, 0xe3, 0xa6,
0xeb, 0x29, 0x5a, 0x24, 0xf1, 0x3f, 0xb0, 0x0d, 0x90, 0x0f, 0xc7, 0xec, 0x30, 0x46, 0xc8, 0xf6,
0xe2, 0x57, 0x9b, 0xeb, 0x02, 0x2f, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x68, 0x9e, 0x33,
0x4b, 0x01, 0x00, 0x00,
}
packages/gossip/proto/message.proto deleted 100644 → 0
+ 0
− 26
View file @ 1ff8046d
syntax = "proto3";
option go_package = "github.com/iotaledger/goshimmer/packages/gossip/proto";
package proto;
//import "peer/proto/peer.proto";
//import "peer/service/proto/service.proto";
message ConnectionRequest {
// protocol version number
uint32 version = 1;
// string form of the return address (e.g. "192.0.2.1:25", "[2001:db8::1]:80")
string from = 2;
// string form of the recipient address
string to = 3;
// unix time
int64 timestamp = 4;
}
message SignedConnectionRequest {
// data of the request
ConnectionRequest request = 1;
// signature of the request
bytes signature = 2;
}
\ No newline at end of file
packages/gossip/protocol.go deleted 100644 → 0
+ 0
− 61
View file @ 1ff8046d
package gossip
import (
"crypto/ed25519"
"github.com/golang/protobuf/proto"
"github.com/iotaledger/autopeering-sim/peer"
pb "github.com/iotaledger/goshimmer/packages/gossip/proto"
)
type Local struct {
id peer.ID
key peer.PrivateKey
}
type Protocol struct {
version uint32
local *Local
mgr *Manager
neighbors map[string]*peer.Peer
}
func sendRequest(p *Protocol, to *peer.Peer) error {
msg := &pb.ConnectionRequest{
Version: p.version,
From: p.local.id.String(),
To: to.ID().String(),
Timestamp: 1,
}
return nil
}
func verifyRequest(p *Protocol, msg *pb.ConnectionRequest, signature []byte) error {
requester, ok := p.neighbors[msg.GetFrom()]
if !ok {
return errSender
}
if msg.GetVersion() != p.version {
return errVersion
}
if msg.GetTo() != p.local.id.String() {
return errRecipient
}
msgBytes, err := proto.Marshal(msg)
if err != nil {
return err
}
if !ed25519.Verify(ed25519.PublicKey(requester.PublicKey()), msgBytes, signature) {
return errSignature
}
return nil
}
func signRequest(key peer.PrivateKey, msg *pb.ConnectionRequest) (signature []byte, err error) {
msgByte, err := proto.Marshal(msg)
if err != nil {
return signature, err
}
return ed25519.Sign(ed25519.PrivateKey(key), msgByte), nil
}
packages/gossip/protocol_test.go deleted 100644 → 0
+ 0
− 50
View file @ 1ff8046d
package gossip
import (
"crypto/ed25519"
"fmt"
"testing"
"github.com/iotaledger/autopeering-sim/peer"
"github.com/iotaledger/autopeering-sim/peer/service"
pb "github.com/iotaledger/goshimmer/packages/gossip/proto"
)
const (
testNetwork = "tcp"
testAddress = "127.0.0.1:8000"
)
func newTestServiceRecord() *service.Record {
services := service.New()
services.Update(service.PeeringKey, testNetwork, testAddress)
return services
}
func TestVerifyRequest(t *testing.T) {
pubA, privA, _ := ed25519.GenerateKey(nil)
pubB, privB, _ := ed25519.GenerateKey(nil)
peerA := &Local{
id: peer.PublicKey(pubA).ID(),
key: peer.PrivateKey(privA),
}
peerB := peer.NewPeer(peer.PublicKey(pubB), newTestServiceRecord())
p := &Protocol{
version: 1,
local: peerA,
neighbors: map[string]*peer.Peer{
peerB.ID().String(): peerB,
},
}
msg := &pb.ConnectionRequest{
Version: 1,
From: peerB.ID().String(),
To: peerA.id.String(),
Timestamp: 1,
}
signature, _ := signRequest(peer.PrivateKey(privB), msg)
err := verifyRequest(p, msg, signature)
if err != nil {
fmt.Println("Error:", err)
}
}
packages/gossip/transport/transport.go deleted 100644 → 0
+ 0
− 25
View file @ 1ff8046d
package transport
const (
// MaxPacketSize specifies the maximum allowed size of packets.
// Packets larger than this will be cut and thus treated as invalid.
MaxPacketSize = 1280
)
// Transport is generic network connection to transfer protobuf packages.
// Multiple goroutines may invoke methods on a Conn simultaneously.
type Transport interface {
// ReadFrom reads a packet from the connection. It returns the package and
// the return address for that package in string form.
ReadFrom() (pkt []byte, address string, err error)
// WriteTo writes a packet to the string encoded target address.
WriteTo(pkt []byte, address string) error
// Close closes the transport layer.
// Any blocked ReadFrom or WriteTo operations will return errors.
Close()
// LocalAddr returns the local network address in string form.
LocalAddr() string
}
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