diff --git a/packages/client/libclient-py/quickmpc/share/random.py b/packages/client/libclient-py/quickmpc/share/random.py index 73b923086..d2fce5980 100644 --- a/packages/client/libclient-py/quickmpc/share/random.py +++ b/packages/client/libclient-py/quickmpc/share/random.py @@ -23,72 +23,34 @@ def get_list(self, a, b, size: int) -> List[int]: @dataclass(frozen=True) class ChaCha20(RandomInterface): + def __exception_check(self, a, b) -> None: + if a >= b: + raise ArgumentError( + "乱数の下限は上限より小さい必要があります．" + f"{a} < {b}") + if type(a) != type(b): + raise ArgumentError( + "乱数の下限と上限の型は一致させる必要があります．" + f"{type(a)} != {type(b)}") - # 128bit符号付き整数最大，最小値 - mx: ClassVar[int] = (1 << 128)-1 - mn: ClassVar[int] = -(1 << 128) + def __get_byte_size(self, x: int) -> int: + # 整数の byte サイズを取得 + return max(math.ceil(math.log2(x))//8 + 1, 32) @methoddispatch() - def get(self, a, b): - raise ArgumentError( - "乱数の閾値はどちらもintもしくはdecimalでなければなりません．" - f"a is {type(a)}, b is {type(b)}") - - @get.register(int) - def __get_int(self, a: int, b: int) -> int: - # TRNGで [a,b) の乱数生成 + def get(self, a, b) -> int: self.__exception_check(a, b) interval_byte = self.__get_byte_size(b-a) byte_val: bytes = random(interval_byte) int_val = int.from_bytes(byte_val, "big") return int_val % (b - a) + a - @get.register(Decimal) - def __get_decimal(self, a: Decimal, b: Decimal) -> Decimal: - # 256bit整数を取り出して[a,b]に正規化する - self.__exception_check(a, b) - val: int = self.get(self.mn, self.mx) - return Decimal(val-self.mn)/(self.mx-self.mn)*(b-a)+a - @methoddispatch() def get_list(self, a, b, size: int): - raise ArgumentError( - "乱数の閾値はどちらもintもしくはdecimalでなければなりません．" - f"a is {type(a)}, b is {type(b)}") - - @get_list.register(int) - def __get_list_int(self, a: int, b: int, size: int) -> List[int]: - # TRNGの32byteをseedとしてCSPRNGでsize分生成 - byte_size: int = self.__get_byte_size(b-a) self.__exception_check(a, b) - seed: bytes = self.__get_32byte() - bytes_list: bytes = randombytes_deterministic(size*byte_size, seed) - int_list = [int.from_bytes(bytes_list[i:i+byte_size], "big") - for i in range(0, len(bytes_list), byte_size)] - return [x % (b-a)+a for x in int_list] - - @get_list.register(Decimal) - def __get_list_decimal(self, a: Decimal, b: Decimal, size: int) \ - -> List[Decimal]: - # 128bit整数を取り出して[a,b]に正規化する - self.__exception_check(a, b) - valList: List[int] = self.get_list(self.mn, self.mx, size) - return [Decimal(val-self.mn)/(self.mx-self.mn)*(b-a)+a - for val in valList] - - def __get_byte_size(self, x: int) -> int: - # 整数の byte サイズを取得 - return max(math.ceil(math.log2(x))//8 + 1, 32) - - def __get_32byte(self) -> bytes: - return random() - - def __exception_check(self, a, b) -> None: - if a >= b: - raise ArgumentError( - "乱数の下限は上限より小さい必要があります．" - f"{a} < {b}") - if type(a) != type(b): - raise ArgumentError( - "乱数の下限と上限の型は一致させる必要があります．" - f"{type(a)} != {type(b)}") + interval_byte = self.__get_byte_size(b-a) + byte_list: bytes = random(interval_byte * size) + int_list = [int.from_bytes(byte_list[i:i+interval_byte], "big") + for i in range(0, len(byte_list), interval_byte)] + return [int_val % (b - a) + a for int_val in int_list] + \ No newline at end of file diff --git a/packages/client/libclient-py/quickmpc/share/share.py b/packages/client/libclient-py/quickmpc/share/share.py index 8e4bb7065..62b18a3d5 100644 --- a/packages/client/libclient-py/quickmpc/share/share.py +++ b/packages/client/libclient-py/quickmpc/share/share.py @@ -18,25 +18,10 @@ @dataclass(frozen=True) class Share: - __share_random_range: ClassVar[Tuple[Decimal, Decimal]] =\ - (Decimal(-(1 << 64)), Decimal(1 << 64)) + __SHIFT_VAL = 10**8 + __SECRET_RANGE = 10**19 * __SHIFT_VAL - @methoddispatch(is_static_method=True) - @staticmethod - def __to_str(_): - logger.error("Invalid argument on stringfy.") - raise ArgumentError("不正な引数が与えられています．") - - @__to_str.register(Decimal) - @staticmethod - def __decimal_to_str(val: Decimal) -> str: - # InfinityをCCで読み込めるinfに変換 - return 'inf' if Decimal.is_infinite(val) else str(val) - - @__to_str.register(int) - @staticmethod - def __int_to_str(val: int) -> str: - return str(val) + Scalar = Union[int, float, Decimal] @methoddispatch(is_static_method=True) @staticmethod @@ -44,147 +29,39 @@ def sharize(_, __): logger.error("Invalid argument on sharize.") raise ArgumentError("不正な引数が与えられています．") - @methoddispatch(is_static_method=True) - @staticmethod - def recons(_): - logger.error("Invalid argument on recons.") - raise ArgumentError("不正な引数が与えられています．") - - @methoddispatch(is_static_method=True) + @sharize.register(Scalar) @staticmethod - def convert_type(_, __): - logger.error("Invalid argument on convert_type.") - raise ArgumentError("不正な引数が与えられています．") - - @sharize.register(int) - @sharize.register(float) - @staticmethod - def __sharize_scalar(secrets: float, party_size: int = 3) -> List[str]: + def __sharize_scalar(secret: Scalar, party_size: int = 3) -> List[str]: """ スカラ値のシェア化 """ + secret *= Share.__SHIFT_VAL + if abs(secret) > Share.__SECRET_RANGE: + logger.error("Out of range") + raise ArgumentError("Out of range") rnd: RandomInterface = ChaCha20() - shares: List[int] = rnd.get_list( - *Share.__share_random_range, party_size) - shares[0] += Decimal(secrets) - np.sum(shares) - shares_str: List[str] = [str(n) for n in shares] - return shares_str + shares: List[Decimal] = rnd.get_list(-Share.__SECRET_RANGE, Share.__SECRET_RANGE, party_size) + shares[0] += Decimal(secret) - np.sum(shares) + return [str(n / Share.__SHIFT_VAL) for n in shares] - @sharize.register((Dim1, float)) + @sharize.register(List) @staticmethod - def __sharize_1dimension_float(secrets: List[Union[float, Decimal]], - party_size: int = 3) \ - -> List[List[str]]: - """ 1次元リストのシェア化 """ - rnd: RandomInterface = ChaCha20() - secrets_size: int = len(secrets) - shares: np.ndarray = np.array([ - rnd.get_list(*Share.__share_random_range, secrets_size) - for __ in range(party_size - 1)]) - s1: np.ndarray = np.subtract(np.frompyfunc(Decimal, 1, 1)(secrets), - np.sum(shares, axis=0)) - shares_str: List[List[str]] = \ - np.vectorize(Share.__to_str)([s1, *shares]).tolist() - return shares_str + def __sharize_multidim(secrets: List[Scalar], party_size: int = 3): + return [Share.__sharize(secret, party_size) for secret in secrets] - @sharize.register((Dim1, Decimal)) - @staticmethod - def __sharize_1dimension_decimal(secrets: List[Decimal], - party_size: int = 3) \ - -> List[List[str]]: - return Share.__sharize_1dimension_float(secrets, party_size) - - @sharize.register((Dim1, int)) - @staticmethod - def __sharize_1dimension_int(secrets: List[int], party_size: int = 3) \ - -> List[List[str]]: - """ 1次元リストのシェア化 """ - rnd: RandomInterface = ChaCha20() - secrets_size: int = len(secrets) - max_val = (max(secrets)+1) * 2 - shares: np.ndarray = np.array([ - rnd.get_list(-max_val, max_val, secrets_size) - for __ in range(party_size - 1)]) - s1: np.ndarray = np.subtract(np.frompyfunc(int, 1, 1)(secrets), - np.sum(shares, axis=0)) - shares_str: List[List[str]] = np.vectorize( - Share.__to_str)([s1, *shares]).tolist() - return shares_str - - @sharize.register(Dim2) - @staticmethod - def __sharize_2dimension(secrets: List[List[Union[float, int]]], - party_size: int = 3) -> List[List[List[str]]]: - """ 2次元リストのシェア化 """ - transposed: List[Union[List[int], List[float]]] \ - = np.array(secrets, dtype=object).transpose().tolist() - dst: List[List[List[str]]] = [ - Share.sharize(col, party_size) for col in transposed - ] - dst = np.array(dst, dtype=object).transpose(1, 2, 0).tolist() - - return dst - - @sharize.register(dict) - @staticmethod - def __sharize_dict(secrets: dict, party_size: int = 3) -> List[dict]: - """ 辞書型のシェア化 """ - shares_str: List[dict] = [dict() for _ in range(party_size)] - for key, val in secrets.items(): - for i, share_val in enumerate(Share.sharize(val, party_size)): - shares_str[i][key] = share_val - return shares_str - - @sharize.register(DictList) + @methoddispatch(is_static_method=True) @staticmethod - def __sharize_dictlist(secrets: dict, party_size: int = 3) \ - -> List[List[dict]]: - """ 辞書型配列のシェア化 """ - shares_str: List[List[dict]] = [[] for _ in range(party_size)] - for secret_dict in secrets: - share_dict: List[dict] = Share.sharize(secret_dict, party_size) - for ss, sd in zip(shares_str, share_dict): - ss.append(sd) - return shares_str + def recons(_): + logger.error("Invalid argument on sharize.") + raise ArgumentError("不正な引数が与えられています．") - @recons.register(Dim1) + @recons.register(List[Scalar]) @staticmethod - def __recons_list1(shares: List[Union[int, Decimal]]): - """ 1次元リストのシェアを復元 """ + def __recons_scalar(shares: List[Scalar]): return sum(shares) - @recons.register(Dim2) - @recons.register(Dim3) + @recons.register(List[List]) @staticmethod - def __recons_list(shares: List[List[Union[int, Decimal]]]) -> List: - """ リストのシェアを復元 """ - secrets: List = [ - Share.recons([shares_pi[i] for shares_pi in shares]) - for i in range(len(shares[0])) - ] - return secrets - - @recons.register(DictList) - @staticmethod - def __recons_dictlist(shares: List[dict]) -> dict: - """ 辞書型を復元 """ - secrets: dict = dict() - for key in shares[0].keys(): - val = [] - for s in shares: - val.append(s[key]) - secrets[key] = Share.recons(val) - return secrets - - @recons.register(DictList2) - @staticmethod - def __recons_dictlist2(shares: List[List[dict]]) -> list: - """ 辞書型配列を復元 """ - secrets: list = list() - for i in range(len(shares[0])): - val = [] - for s in shares: - val.append(s[i]) - secrets.append(Share.recons(val)) - return secrets + def __recons_multidim(multidim_shares: List[List]) -> List: + return [Share.recons(shares) for shares in multidim_shares] @staticmethod def get_pre_convert_func( @@ -226,6 +103,12 @@ def get_convert_func( return Share.convert_int_to_str return float + @methoddispatch(is_static_method=True) + @staticmethod + def convert_type(_, __): + logger.error("Invalid argument on convert_type.") + raise ArgumentError("不正な引数が与えられています．") + @convert_type.register(str) @staticmethod def __pre_convert_type_str( diff --git a/packages/server/beaver_triple_service/triple_generator/triple_generator.go b/packages/server/beaver_triple_service/triple_generator/triple_generator.go index 81fe277c3..2b96437bd 100644 --- a/packages/server/beaver_triple_service/triple_generator/triple_generator.go +++ b/packages/server/beaver_triple_service/triple_generator/triple_generator.go @@ -2,6 +2,7 @@ package triplegenerator import ( "errors" + "math/big" jwt_types "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/jwt" logger "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/log" @@ -11,32 +12,38 @@ import ( ) var Db *ts.SafeTripleStore -var tripleRandMax = int64(1000) -var tripleRandMin = int64(-1000) + +// a,b の生成範囲は 10^{19+8} ~ 2^{90} +var tripleBitLength uint32 = 90 func init() { Db = ts.GetInstance() } -func sharize(data int64, size uint32) ([]int64, error) { - sharizeRandMin := - int64(1 << 60) - sharizeRandMax := int64(1 << 60) - shares, err := utils.GetRandInt64Slice(uint64(size-1), sharizeRandMin, sharizeRandMax) +func sharize(data big.Int, bitLength uint32, party_num uint32) ([]big.Int, error) { + shares, err := utils.GetRandBigInts(bitLength, party_num - 1) if err != nil { errText := "乱数取得に失敗" logger.Error(errText) return nil, errors.New(errText) } - sum := int64(0) - for _, x := range shares { - sum += x + for _, share := range shares { + data.Sub(&data, &share) } + shares = append(shares, data) - shares = append(shares, data-sum) return shares, nil } +func toBytes(share big.Int) (pb.BigIntByte, error) { + ret := pb.BigIntByte{ + Sgn : share.Sign() == -1, + Byte : share.Bytes(), + } + return ret, nil +} + func GenerateTriples(claims *jwt_types.Claim, amount uint32) (map[uint32]([]*ts.Triple), error) { ret := make(map[uint32]([]*ts.Triple)) party_num := uint32(len(claims.PartyInfo)) @@ -45,37 +52,50 @@ func GenerateTriples(claims *jwt_types.Claim, amount uint32) (map[uint32]([]*ts. ret[partyId] = []*ts.Triple{} } - for i := uint32(0); i < amount; i++ { - randInt64Slice, err := utils.GetRandInt64Slice(2, tripleRandMin, tripleRandMax) - if err != nil { - errText := "乱数取得に失敗" - logger.Error(errText) - return nil, errors.New(errText) - } + ab, err := utils.GetRandBigInts(tripleBitLength, 2*amount) + if err != nil { + errText := "乱数取得に失敗" + logger.Error(errText) + return nil, errors.New(errText) + } - a := randInt64Slice[0] - b := randInt64Slice[1] - c := a * b + for i := uint32(0); i < 2*amount; i+=2 { + var a big.Int = ab[i] + var b big.Int = ab[i] + var c big.Int + c.Mul(&a, &b) - aShares, err := sharize(a, party_num) + aShares, err := sharize(a, tripleBitLength, party_num) if err != nil { return nil, err } - bShares, err := sharize(b, party_num) + bShares, err := sharize(b, tripleBitLength, party_num) if err != nil { return nil, err } - cShares, err := sharize(c, party_num) + cShares, err := sharize(c, 2*tripleBitLength, party_num) if err != nil { return nil, err } // partyIdは1-index for partyId := uint32(1); partyId <= party_num; partyId++ { + a_, err := toBytes(aShares[partyId-1]) + if err != nil{ + return nil, err + } + b_, err := toBytes(bShares[partyId-1]) + if err != nil{ + return nil, err + } + c_, err := toBytes(cShares[partyId-1]) + if err != nil{ + return nil, err + } t := ts.Triple{ - A: aShares[partyId-1], - B: bShares[partyId-1], - C: cShares[partyId-1], + A: &a_, + B: &b_, + C: &c_, } ret[partyId] = append(ret[partyId], &t) } diff --git a/packages/server/beaver_triple_service/triple_generator/triple_generator_test.go b/packages/server/beaver_triple_service/triple_generator/triple_generator_test.go index 5f90353bd..4e01e168c 100644 --- a/packages/server/beaver_triple_service/triple_generator/triple_generator_test.go +++ b/packages/server/beaver_triple_service/triple_generator/triple_generator_test.go @@ -5,11 +5,13 @@ import ( "fmt" "testing" "sync" + "math/big" jwt_types "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/jwt" utils "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/utils" tg "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/triple_generator" ts "github.com/acompany-develop/QuickMPC/packages/server/beaver_triple_service/triple_store" + pb "github.com/acompany-develop/QuickMPC/proto/engine_to_bts" ) type TriplesStock struct{ @@ -80,14 +82,24 @@ func multiGetTriples(t *testing.T, jobId uint32, partyId uint32, amount uint32, }) } +func convertToBigInt(b &pb.BigIntByte)(big.Int){ + var ret big.Int + bytes := b.Byte + ret.SetBytes(bytes) + if b.sgn{ + ret *= -1 + } + return ret +} + func testValidityOfTriples(t *testing.T) { for _, PartyToTriples := range TS.Stock { for i := 0; i < len(PartyToTriples[1]); i++ { - aShareSum, bShareSum, cShareSum := int64(0), int64(0), int64(0) + aShareSum, bShareSum, cShareSum := big.NewInt(0), big.NewInt(0), big.NewInt(0) for partyId := uint32(1); partyId <= uint32(len(PartyToTriples)); partyId++ { - aShareSum += PartyToTriples[partyId][i].A - bShareSum += PartyToTriples[partyId][i].B - cShareSum += PartyToTriples[partyId][i].C + aShareSum += convertToBigInt(PartyToTriples[partyId][i].A) + bShareSum += convertToBigInt(PartyToTriples[partyId][i].B) + cShareSum += convertToBigInt(PartyToTriples[partyId][i].C) } if aShareSum*bShareSum != cShareSum { t.Fatal("a*b != c") diff --git a/packages/server/beaver_triple_service/triple_store/triple_store_test.go b/packages/server/beaver_triple_service/triple_store/triple_store_test.go index bd157c8b5..c603cc941 100644 --- a/packages/server/beaver_triple_service/triple_store/triple_store_test.go +++ b/packages/server/beaver_triple_service/triple_store/triple_store_test.go @@ -29,27 +29,58 @@ func getClaims() (*jwt_types.Claim, error) { return nil,fmt.Errorf("BTS TOKEN is not valified") } +func convertToBigIntByte(a int64)(e2b.BigIntByte, error){ + sgn := bool(a < 0) + buf := new(bytes.Buffer) + err := binary.Write(buf, binary.BigEndian, a) + if err != nil { + return nil, err + } + byteSlice := buf.Bytes() + return e2b.BigIntByte{ + Sgn : sgn, + byteSlice : byte, + }, nil +} + +func convertToTriple(a,b,c int64)(e2b.Triple, error){ + a_, err := convertToBigIntByte(a) + if err != nil{ + return nil, err + } + b_, err := convertToBigIntByte(b) + if err != nil{ + return nil, err + } + c_, err := convertToBigIntByte(c) + if err != nil{ + return nil, err + } + return e2b.Triple{ + A : a_, + B : b_, + C : c_, + }, nil +} + func generateTriples(amount uint32) map[uint32]([]*ts.Triple) { ret := make(map[uint32]([]*ts.Triple)) for i := uint32(0); i < amount; i++ { - t := ts.Triple{ - A: 1, - B: 1, - C: 3, + t, err := convertToTriple(1, 1, 3) + if err != nil{ + return nil, err } ret[1] = append(ret[1], &t) - t = ts.Triple{ - A: 2, - B: 2, - C: 6, + t, err = convertToTriple(2, 2, 6) + if err != nil{ + return nil, err } ret[2] = append(ret[2], &t) - t = ts.Triple{ - A: 3, - B: 3, - C: 9, + t, err = convertToTriple(3, 3, 9) + if err != nil{ + return nil, err } ret[3] = append(ret[3], &t) } diff --git a/packages/server/beaver_triple_service/utils/csprng.go b/packages/server/beaver_triple_service/utils/csprng.go index e7021afc8..5925a8836 100644 --- a/packages/server/beaver_triple_service/utils/csprng.go +++ b/packages/server/beaver_triple_service/utils/csprng.go @@ -9,9 +9,26 @@ import ( "math/big" ) -func mod(x, y int64) int64 { - bx, by := big.NewInt(x), big.NewInt(y) - return new(big.Int).Mod(bx, by).Int64() +// [0, 2^{bitLength}) の乱数を amount 個生成 +func GetRandBigInts(bitLength uint32, amount uint32) ([]big.Int, error) { + var byteLength uint32 = (bitLength + 8 - 1) / 8 + + bSlice := make([]byte, byteLength * amount) + _, err := rand.Read(bSlice) + if err != nil { + return nil, err + } + + randSlice := make([]big.Int, amount) + + for i := uint32(0); i < amount; i++ { + var n big.Int + buf := bSlice[i*byteLength : (i+1)*byteLength] + n.SetBytes(buf) + randSlice[i] = n + } + + return randSlice, nil } func GetRandInt64Slice(sliceSize uint64, randMin int64, randMax int64) ([]int64, error) { @@ -33,8 +50,11 @@ func GetRandInt64Slice(sliceSize uint64, randMin int64, randMax int64) ([]int64, if err != nil { return nil, err } + if n < 0{ + n = -n + } - tmp := mod(n, randMax-randMin+1) + tmp := n % (randMax-randMin+1) rand := tmp + randMin if (rand < randMin) || (rand > randMax) { return nil, fmt.Errorf("範囲外エラー {n: %d, randMin: %d, randMax: %d, rand: %d, tmp: %d}", n, randMin, randMax, rand, tmp) @@ -43,4 +63,4 @@ func GetRandInt64Slice(sliceSize uint64, randMin int64, randMax int64) ([]int64, } return randSlice, nil -} +} \ No newline at end of file diff --git a/packages/server/computation_container/bts_handler/job.hpp b/packages/server/computation_container/bts_handler/job.hpp index 1415a62cb..c3724c947 100644 --- a/packages/server/computation_container/bts_handler/job.hpp +++ b/packages/server/computation_container/bts_handler/job.hpp @@ -1,5 +1,6 @@ #pragma once #include "external/proto/engine_to_bts/engine_to_bts.grpc.pb.h" +#include "external/proto/computation_to_computation_container/computation_to_computation.grpc.pb.h" #include #include @@ -7,11 +8,11 @@ namespace qmpc::BtsHandler::BTSJobType { namespace etb = enginetobts; +using BIB = computationtocomputation::BigIntByte; -template struct Triple { - using result_type = std::tuple; + using result_type = std::tuple; using response_type = etb::GetTriplesResponse; static inline std::string op_name = "GetTriples"; @@ -33,16 +34,15 @@ struct Triple for (size_t i = 0; i < length; i++) { auto triple = response.triples(i); - ret[i] = std::make_tuple(T(triple.a()), T(triple.b()), T(triple.c())); + ret[i] = std::make_tuple(triple.a(), triple.b(), triple.c()); } return ret; } }; -template struct RandBit { - using result_type = T; + using result_type = std::int64_t; using response_type = etb::GetRandBitsResponse; static inline std::string op_name = "GetRandBits"; diff --git a/packages/server/computation_container/bts_handler/stock_bts.hpp b/packages/server/computation_container/bts_handler/stock_bts.hpp index 3f58491de..960872a4f 100644 --- a/packages/server/computation_container/bts_handler/stock_bts.hpp +++ b/packages/server/computation_container/bts_handler/stock_bts.hpp @@ -54,9 +54,6 @@ class StockBTS } }; -template -using StockTriple = StockBTS>; - -template -using StockRandBit = StockBTS>; +using StockTriple = StockBTS; +using StockRandBit = StockBTS; } // namespace qmpc::BtsHandler diff --git a/packages/server/computation_container/client/computation_to_computation_container/client.hpp b/packages/server/computation_container/client/computation_to_computation_container/client.hpp index 4f08b4a02..ca0304109 100644 --- a/packages/server/computation_container/client/computation_to_computation_container/client.hpp +++ b/packages/server/computation_container/client/computation_to_computation_container/client.hpp @@ -59,7 +59,7 @@ class Client s = computationtocomputation::Shares{}; } size = size + value_size; - computationtocomputation::Shares_Share *multiple_shares = s.add_share_list(); + auto *multiple_shares = s.add_share_list(); using rawT = std::decay_t; @@ -73,7 +73,9 @@ class Client } else { - multiple_shares->set_byte(to_string(values[i])); + //static_assert(std::is_same_v); + computationtocomputation::BigIntByte* fp = multiple_shares->mutable_fp(); + fp = values[i].getBytes(); } } share_vec.push_back(s); diff --git a/packages/server/computation_container/fixed_point/fixed_point.hpp b/packages/server/computation_container/fixed_point/fixed_point.hpp index 01b83748b..56c10a33e 100644 --- a/packages/server/computation_container/fixed_point/fixed_point.hpp +++ b/packages/server/computation_container/fixed_point/fixed_point.hpp @@ -8,246 +8,166 @@ #include #include #include +#include "external/proto/computation_to_computation_container/computation_to_computation.grpc.pb.h" namespace qmpc::Utils { -template -inline static constexpr T mypow(T a_, U n_) noexcept -{ - T a = a_; - U n = n_; - T ret = 1; - while (n > 0) - { - if (n & 1) ret *= a; - a *= a; - n >>= 1; - } - return ret; -} -namespace mp = boost::multiprecision; -using cpp_dec_float = mp::number>; -/* -T:保持する整数型 -D:変換する浮動小数点型 -length:10^length が最大値 -resolution:10^resolutionを1とする -*/ -template < - typename T = boost::multiprecision::cpp_int, - typename D = cpp_dec_float, - int length = 18, - int resolution = 8> -class FixedPointImpl : private boost::operators> +using mp_int = boost::multiprecision::cpp_int; +using mp_float = boost::multiprecision::number>; +using BIB = computationtocomputation::BigIntByte; + +class FixedPoint : private boost::operators { private: - constexpr static long long shift = mypow(10ll, resolution); - constexpr static long long maxInt = - mypow(10ll, length - resolution); // FixedPointImplがとりうる整数の最大値 - T value; - + constexpr static int shift = 100'000'000; + mp_int value; public: - FixedPointImpl() : value(0) {} - FixedPointImpl(const FixedPointImpl &v) : value(v.value) {} - FixedPointImpl(FixedPointImpl &&v) : value(std::move(v.value)) {} - template < - typename U, - std::enable_if_t< - std::is_arithmetic_v< - std::remove_reference_t> or std::is_convertible_v>, - std::nullptr_t> = nullptr> - FixedPointImpl(const U &v) - { - if constexpr (std::is_floating_point_v) - { - if (boost::math::isinf(v)) - { - value = static_cast(maxInt); - } - else - { - // cast to `D` first to avoid going infinity - const D value_float = static_cast(v); - value = static_cast(value_float * shift); - } - } - else - value = static_cast(v) * shift; + FixedPoint() : value(0) {} + FixedPoint(const FixedPoint &v) : value(v.value) {} + FixedPoint(FixedPoint &&v) : value(std::move(v.value)) {} + template >, + std::nullptr_t> = nullptr> + FixedPoint(const T &v) + { + mp_float tmp = static_cast(v); + tmp *= shift; + value = static_cast(tmp); } - FixedPointImpl(const std::string &str) + FixedPoint(const std::string &str) { - D v_{str}; - if (boost::math::isinf(v_)) + mp_float v_{str}; + value = static_cast(v_ * shift); + } + FixedPoint(const BIB &P) + { + std::string bytes = P.byte(); + import_bits(value, bytes.begin(), bytes.end(), 8); + if(P.sgn()) { - value = static_cast(maxInt); + value *= -1; } - else - value = static_cast(v_ * shift); } - FixedPointImpl &operator=(const FixedPointImpl &obj) + + // shift をかけずに代入する i.e., raw(1) は実質的に 10^-8 を代入することに対応 + template + static FixedPoint raw(const T &v) + { + FixedPoint ret{}; + ret.value = v; + return ret; + } + + FixedPoint &operator=(const FixedPoint &obj) { value = obj.value; return *this; } - FixedPointImpl &operator=(FixedPointImpl &&obj) + FixedPoint &operator=(FixedPoint &&obj) { value = std::move(obj.value); return *this; } - template - U getVal() const + + template + T getShiftedVal() const { - return value.template convert_to(); + return value.template convert_to(); } - std::string getStrVal() const + double getDoubleVal() const { - D ret{this->getVal()}; - if (boost::math::isinf(ret)) - { - ret = static_cast(maxInt); - } - ret /= shift; - return ret.str(20, std::ios_base::fixed); + mp_float ret = static_cast(value); + return static_cast(ret / shift); } - T getRoundValue() const + mp_int getRoundValue() const { - D ret{this->getVal()}; - if (boost::math::isinf(ret)) + mp_int ret = value / shift; + if ((value % shift) * 2 >= shift) { - ret = static_cast(maxInt); + ret++; } - ret /= shift; - ret = mp::round(ret); - return static_cast(ret); + return ret; } - - D getSqrtValue() const + std::string getStrVal() const { - D ret{this->getVal()}; - if (boost::math::isinf(ret)) - { - ret = static_cast(maxInt); - } + mp_float ret = static_cast(value); ret /= shift; - ret = mp::sqrt(ret); - return ret; + return ret.str(20, std::ios_base::fixed); } - double getDoubleVal() const + BIB getBytes() const { - auto ret{this->getVal()}; - if (boost::math::isinf(ret)) - { - ret = static_cast(maxInt); - } - return ret / shift; + BIB ret; + ret.set_sgn(value < 0); + std::string bytes; + export_bits(value, std::back_inserter(bytes), 8); + ret.set_byte(bytes); + return ret; } - constexpr static auto getShift() noexcept { return shift; } - constexpr static auto getMaxInt() noexcept { return maxInt; } - FixedPointImpl getInv() const + void setShare(computationtocomputation::Share& share) const { - D inv{this->getVal()}; - if (boost::math::isinf(inv)) - { - inv = static_cast(maxInt); - } - return FixedPointImpl(D{shift} / inv); + auto fp = share->mutable_fp(); + fp = (*this).getBytes(); } - FixedPointImpl operator-() const + + FixedPoint operator-() const { - FixedPointImpl ret{}; + FixedPoint ret{}; ret.value = -value; return ret; } - FixedPointImpl &operator+=(const FixedPointImpl &obj) + FixedPoint &operator+=(const FixedPoint &obj) { value += obj.value; return *this; } - FixedPointImpl &operator-=(const FixedPointImpl &obj) + FixedPoint &operator-=(const FixedPoint &obj) { value -= obj.value; return *this; } - /* - TODO: - オーバーフローの可能性が10^shift^2 = 10^12の掛け算でかなり高くなってしまうので - 一時的に浮動小数点に戻してから演算を行うことも考慮しておく - */ - FixedPointImpl &operator*=(const FixedPointImpl &obj) - { - //直接変換でオーバーフローする場合は以下のように文字列に変換する - // D tmp{D(value.template str()) * D(obj.value.template str())}; - // std::string str = tmp.template str(); - // value = T(str); - // value /= shift; + FixedPoint &operator*=(const FixedPoint &obj) + { value *= obj.value; - value /= shift; //整数で保持するため余分なshiftを除算する + value /= shift; return *this; } - FixedPointImpl &operator/=(const FixedPointImpl &obj) + FixedPoint &operator/=(const FixedPoint &obj) { - D inv{obj.getVal()}; - if (boost::math::isinf(inv)) - { - inv = static_cast(maxInt); - } - D v = (this->getVal() / inv) * shift; - value = v.template convert_to(); + value *= shift; + value /= obj.value; return *this; } - FixedPointImpl &operator%=(const FixedPointImpl &obj) + FixedPoint &operator%=(const FixedPoint &obj) { value %= obj.value; return *this; } - FixedPointImpl &operator++() + FixedPoint &operator++() { value += shift; // shift分ずれるので1*shift return *this; } - FixedPointImpl &operator--() + FixedPoint &operator--() { value -= shift; // shift分ずれるので1*shift return *this; } - bool operator==(const FixedPointImpl &obj) const noexcept + bool operator==(const FixedPoint &obj) const noexcept { return (value - obj.value >= -1 and value - obj.value <= 1) ? true : false; } - bool operator<(const FixedPointImpl &obj) const noexcept { return value < obj.value; } - /* - 標準入出力に入力するとShiftで割った結果が出力される。 - FixedPoint a{5}; - std::cout << a << std::endl; + bool operator<(const FixedPoint &obj) const noexcept { return value < obj.value; } - 5が出力される - - */ - friend std::ostream &operator<<(std::ostream &os, const FixedPointImpl &fp) + friend std::ostream &operator<<(std::ostream &os, const FixedPoint &fp) { os << std::fixed; os << std::setprecision(10); - os << fp.value.template convert_to() / shift; + os << fp.value.template convert_to() / shift; os << std::resetiosflags(std::ios_base::floatfield); return os; } }; -inline auto abs(const FixedPointImpl<> &x) -{ - if (x < FixedPointImpl<>("0.0")) - { - return -x; - } - else - { - return x; - } -} -template -std::string to_string(const FixedPointImpl &fp) -{ - return fp.getStrVal(); -} } // namespace qmpc::Utils -using FixedPoint = qmpc::Utils::FixedPointImpl<>; + +using FixedPoint = qmpc::Utils::FixedPoint; diff --git a/packages/server/computation_container/server/computation_to_computation_container/server.cpp b/packages/server/computation_container/server/computation_to_computation_container/server.cpp index 61bfe86b3..229b7c848 100644 --- a/packages/server/computation_container/server/computation_to_computation_container/server.cpp +++ b/packages/server/computation_container/server/computation_to_computation_container/server.cpp @@ -19,21 +19,6 @@ Server::Server() noexcept } } } - -static std::string share_to_str(const computationtocomputation::Shares_Share &share) -{ - using cs = computationtocomputation::Shares_Share; - switch (share.value_case()) - { - case (cs::ValueCase::kFlag): - return std::to_string(share.flag()); - case (cs::ValueCase::kNum): - return std::to_string(share.num()); - case (cs::ValueCase::kByte): - case (cs::ValueCase::VALUE_NOT_SET): - return share.byte(); - } -} // 複数シェアをexchangeする場合 grpc::Status Server::ExchangeShares( grpc::ServerContext *context, @@ -44,7 +29,7 @@ grpc::Status Server::ExchangeShares( computationtocomputation::Shares multiple_shares; bool first = true; int party_id, share_id, job_id, thread_id; - std::vector share_str_vec; + std::vector shares; while (stream->Read(&multiple_shares)) { @@ -63,9 +48,7 @@ grpc::Status Server::ExchangeShares( for (int i = 0; i < multiple_shares.share_list_size(); i++) { auto share = multiple_shares.share_list(i); - - auto share_str = share_to_str(share); - share_str_vec.emplace_back(share_str); + shares.emplace_back(share); } first = false; } @@ -73,7 +56,7 @@ grpc::Status Server::ExchangeShares( std::lock_guard lock(mtx); // mutex発動 if (!first) { - shares_vec[std::make_tuple(party_id, share_id, job_id, thread_id)] = share_str_vec; + shares_vec[std::make_tuple(party_id, share_id, job_id, thread_id)] = shares; } cond.notify_all(); // 通知 @@ -81,7 +64,7 @@ grpc::Status Server::ExchangeShares( } // 単一シェアget用 -std::string Server::getShare(int party_id, qmpc::Share::AddressId share_id) +computationtocomputation::Share Server::getShare(int party_id, qmpc::Share::AddressId share_id) { Config *conf = Config::getInstance(); std::unique_lock lock(mtx); // mutex発動 @@ -102,14 +85,14 @@ std::string Server::getShare(int party_id, qmpc::Share::AddressId share_id) } // 複数シェアget用 -std::vector Server::getShares( +std::vector Server::getShares( int party_id, const std::vector &share_ids ) { const std::size_t length = share_ids.size(); if (length == 0) { - return std::vector{}; + return {}; } Config *conf = Config::getInstance(); @@ -131,10 +114,10 @@ std::vector Server::getShares( { qmpc::Log::throw_with_trace(std::runtime_error("getShares is timeout")); } - auto local_str_shares = shares_vec[key]; + auto local_shares = shares_vec[key]; shares_vec.erase(key); - assert(local_str_shares.size() == length); - return local_str_shares; + assert(local_shares.size() == length); + return local_shares; } void Server::runServer(std::string endpoint) diff --git a/packages/server/computation_container/server/computation_to_computation_container/server.hpp b/packages/server/computation_container/server/computation_to_computation_container/server.hpp index f3aa54a41..6dea20aa4 100644 --- a/packages/server/computation_container/server/computation_to_computation_container/server.hpp +++ b/packages/server/computation_container/server/computation_to_computation_container/server.hpp @@ -39,8 +39,8 @@ class Server final : public computationtocomputation::ComputationToComputation:: google::protobuf::Empty *response ) override; // 受け取ったシェアをgetするメソッド - std::string getShare(int party_id, qmpc::Share::AddressId share_id); - std::vector getShares( + computationtocomputation::Share getShare(int party_id, qmpc::Share::AddressId share_id); + std::vector getShares( int party_id, const std::vector &share_ids ); Server(Server &&) noexcept = delete; @@ -70,7 +70,7 @@ class Server final : public computationtocomputation::ComputationToComputation:: using address_type = std::tuple; // 受け取ったシェアを保存する変数 // party_id, share_idをキーとして保存 - std::map> shares_vec; + std::map> shares_vec; }; } // namespace qmpc::ComputationToComputation diff --git a/packages/server/computation_container/share/networking.hpp b/packages/server/computation_container/share/networking.hpp index 8eb8ce10c..b5415a111 100644 --- a/packages/server/computation_container/share/networking.hpp +++ b/packages/server/computation_container/share/networking.hpp @@ -95,20 +95,24 @@ void open(const T &share) } template -SV stosv(const std::string &str_value) +SV cctosv(const computationtocomputation::Share &cc_value) { if constexpr (std::is_same_v) { - assert(str_value == "0" || str_value == "1"); - return str_value == "1"; + assert(cc_value.has_flag()); + return cc_value.flag(); } else if constexpr (std::is_integral_v) { - return std::stoll(str_value); + assert(cc_value.has_num()); + return cc_value.num(); } - else // TODO: constructable or convertible + else { - return SV(str_value); + assert(cc_value.has_fp()); + auto tmp = cc_value.fp(); + auto fp = std::make_pair(tmp.sgn(), tmp.byte()); + return SV(fp); } } @@ -129,8 +133,8 @@ auto recons(const Share &share) } else { - std::string s = server->getShare(pt_id, share.getId()); - ret += stosv(s); + auto s = server->getShare(pt_id, share.getId()); + ret += cctosv(s); } } return ret; @@ -162,10 +166,10 @@ auto recons(const std::vector> &share) } else { - std::vector values = server->getShares(pt_id, ids_list); + auto values = server->getShares(pt_id, ids_list); for (unsigned int i = 0; i < length; i++) { - ret[i] += stosv(values[i]); + ret[i] += cctosv(values[i]); } } } diff --git a/packages/server/computation_container/share/share.hpp b/packages/server/computation_container/share/share.hpp index 4f0b0a24b..ac7ba77ce 100644 --- a/packages/server/computation_container/share/share.hpp +++ b/packages/server/computation_container/share/share.hpp @@ -76,8 +76,11 @@ class Share : boost::totally_ordered>, Share &operator*=(const Share &obj) { // Beaver Triplet a, b, c のシェア [a], [b], [c] を得る - auto t = qmpc::BtsHandler::StockTriple::getInstance()->get(); - Share a(std::get<0>(t[0])), b(std::get<1>(t[0])), c(std::get<2>(t[0])); + // Todo : 乗算を別ファイルに分ける + static_assert(std::is_same_v, "乗算は FixedPoint 限定"); + auto t = qmpc::BtsHandler::StockTriple::getInstance()->get(); + auto [a_, b_ ,c_] = t[0]; + Share a(a_), b(b_), c(c_); // [d] = [x] - [a], [e] = [y] - [b] を計算する Share d; @@ -235,6 +238,8 @@ class Share : boost::totally_ordered>, const std::vector &obj1, const std::vector &obj2 ) { + // Todo : 乗算を別ファイルに分ける + static_assert(std::is_same_v, "乗算は FixedPoint 限定"); size_t n = obj1.size(); if (n != obj2.size()) { @@ -243,17 +248,18 @@ class Share : boost::totally_ordered>, ); } // Beaver Triplet a, b, c のシェア [a], [b], [c] を得る - auto t = qmpc::BtsHandler::StockTriple::getInstance()->get(n); + auto ts = qmpc::BtsHandler::StockTriple::getInstance()->get(n); std::vector a, b, c; a.reserve(n); b.reserve(n); c.reserve(n); - for (size_t i = 0; i < n; ++i) + for(const auto&t:ts) { - a.emplace_back(Share(std::get<0>(t[i]))); - b.emplace_back(Share(std::get<1>(t[i]))); - c.emplace_back(Share(std::get<2>(t[i]))); + auto [a_, b_, c_] = t; + a.emplace_back(Share(a_)); + b.emplace_back(Share(b_)); + c.emplace_back(Share(c_)); } // [d] = [x] - [a], [e] = [y] - [b] を計算する std::vector de(n * 2); @@ -339,14 +345,14 @@ auto _sqrt(const T &x) template Share getRandBitShare() { - auto bit = qmpc::BtsHandler::StockRandBit::getInstance()->get(); + auto bit = qmpc::BtsHandler::StockRandBit::getInstance()->get(); return Share(bit[0]); } template std::vector> getRandBitShare(std::size_t amount) { - auto bit = qmpc::BtsHandler::StockRandBit::getInstance()->get(amount); + auto bit = qmpc::BtsHandler::StockRandBit::getInstance()->get(amount); std::vector> ret(amount); for (size_t i = 0; i < amount; i++) diff --git a/packages/server/computation_container/test/benchmark/computation_benchmark/computation_benchmark.cpp b/packages/server/computation_container/test/benchmark/computation_benchmark/computation_benchmark.cpp index 00d197e66..7ca591238 100644 --- a/packages/server/computation_container/test/benchmark/computation_benchmark/computation_benchmark.cpp +++ b/packages/server/computation_container/test/benchmark/computation_benchmark/computation_benchmark.cpp @@ -4,69 +4,69 @@ #include "gtest/gtest.h" #include "logging/logger.hpp" -// 25分経過するとプログラムを終了させる -void timekeep() -{ - sleep(1500); - std::terminate(); -} +// // 25分経過するとプログラムを終了させる +// void timekeep() +// { +// sleep(1500); +// std::terminate(); +// } -// 通信を含んだテストをmain文で実行しています -int main(int argc, char **argv) -{ - Config *conf = Config::getInstance(); +// // 通信を含んだテストをmain文で実行しています +// int main(int argc, char **argv) +// { +// Config *conf = Config::getInstance(); - grpc::EnableDefaultHealthCheckService(true); +// grpc::EnableDefaultHealthCheckService(true); - Url ctoc_ip = conf->ip_addr_map[conf->party_id]; - const std::string ctc_my_ip_str("0.0.0.0:" + ctoc_ip.port); - std::thread server_thread(qmpc::ComputationToComputation::Server::runServer, ctc_my_ip_str); - QMPC_LOG_INFO("ip_addr: {}", ctc_my_ip_str); +// Url ctoc_ip = conf->ip_addr_map[conf->party_id]; +// const std::string ctc_my_ip_str("0.0.0.0:" + ctoc_ip.port); +// std::thread server_thread(qmpc::ComputationToComputation::Server::runServer, ctc_my_ip_str); +// QMPC_LOG_INFO("ip_addr: {}", ctc_my_ip_str); - // healthcheck 用のスレッド - std::vector healthcheck_threads; - // スレッドに渡す healthcheck 処理コード - auto do_healthcheck = [&](const Url &pt_url) - { - auto stub = createStub(pt_url); - for (;;) - { - grpc::ClientContext context; - grpc::health::v1::HealthCheckRequest request; - grpc::health::v1::HealthCheckResponse response; - const grpc::Status status = stub->Check(&context, request, &response); - if (status.ok() && response.status() == grpc::health::v1::HealthCheckResponse::SERVING) - { - break; - } - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - }; - // healthcheck スレッド立ち上げ - for (int pt_id = 1; pt_id <= conf->n_parties; ++pt_id) - { - if (pt_id != conf->party_id) - { - healthcheck_threads.emplace_back(std::thread(do_healthcheck, conf->ip_addr_map[pt_id])); - } - } - // healthcheck スレッド終了待機 - for (auto &th : healthcheck_threads) - { - th.join(); - } +// // healthcheck 用のスレッド +// std::vector healthcheck_threads; +// // スレッドに渡す healthcheck 処理コード +// auto do_healthcheck = [&](const Url &pt_url) +// { +// auto stub = createStub(pt_url); +// for (;;) +// { +// grpc::ClientContext context; +// grpc::health::v1::HealthCheckRequest request; +// grpc::health::v1::HealthCheckResponse response; +// const grpc::Status status = stub->Check(&context, request, &response); +// if (status.ok() && response.status() == grpc::health::v1::HealthCheckResponse::SERVING) +// { +// break; +// } +// std::this_thread::sleep_for(std::chrono::seconds(1)); +// } +// }; +// // healthcheck スレッド立ち上げ +// for (int pt_id = 1; pt_id <= conf->n_parties; ++pt_id) +// { +// if (pt_id != conf->party_id) +// { +// healthcheck_threads.emplace_back(std::thread(do_healthcheck, conf->ip_addr_map[pt_id])); +// } +// } +// // healthcheck スレッド終了待機 +// for (auto &th : healthcheck_threads) +// { +// th.join(); +// } - // 時間計測開始 - std::thread timekeeper_thread(timekeep); +// // 時間計測開始 +// std::thread timekeeper_thread(timekeep); - // インテグレーションテストを実行 - ::testing::InitGoogleTest(&argc, argv); - int ok = RUN_ALL_TESTS(); - if (ok == 0) - std::exit(EXIT_SUCCESS); - else - std::exit(EXIT_FAILURE); +// // インテグレーションテストを実行 +// ::testing::InitGoogleTest(&argc, argv); +// int ok = RUN_ALL_TESTS(); +// if (ok == 0) +// std::exit(EXIT_SUCCESS); +// else +// std::exit(EXIT_FAILURE); - server_thread.join(); - timekeeper_thread.detach(); -} +// server_thread.join(); +// timekeeper_thread.detach(); +// } diff --git a/packages/server/computation_container/test/integration_test/computation_test/computation_test.cpp b/packages/server/computation_container/test/integration_test/computation_test/computation_test.cpp index 8a923c0da..5c7ac0a2d 100644 --- a/packages/server/computation_container/test/integration_test/computation_test/computation_test.cpp +++ b/packages/server/computation_container/test/integration_test/computation_test/computation_test.cpp @@ -5,74 +5,74 @@ #include "gtest/gtest.h" #include "logging/logger.hpp" -// 25分経過するとプログラムを終了させる -void timekeep() -{ - sleep(1500); - std::terminate(); -} +// // 25分経過するとプログラムを終了させる +// void timekeep() +// { +// sleep(1500); +// std::terminate(); +// } -// 通信を含んだテストをmain文で実行しています -int main(int argc, char **argv) -{ - Config *conf = Config::getInstance(); +// // 通信を含んだテストをmain文で実行しています +// int main(int argc, char **argv) +// { +// Config *conf = Config::getInstance(); - grpc::EnableDefaultHealthCheckService(true); +// grpc::EnableDefaultHealthCheckService(true); - Url ctoc_ip = conf->ip_addr_map[conf->party_id]; - Url mtoc_ip = conf->mc_to_cc; +// Url ctoc_ip = conf->ip_addr_map[conf->party_id]; +// Url mtoc_ip = conf->mc_to_cc; - const std::string ctc_my_ip_str("0.0.0.0:" + ctoc_ip.port); - std::thread cc_server_thread(qmpc::ComputationToComputation::Server::runServer, ctc_my_ip_str); - const std::string mtoc_ip_str("0.0.0.0:" + mtoc_ip.port); - std::thread mc_server_thread(qmpc::ManageToComputation::runServer, mtoc_ip_str); - QMPC_LOG_INFO("ip_addr: {}", ctc_my_ip_str); +// const std::string ctc_my_ip_str("0.0.0.0:" + ctoc_ip.port); +// std::thread cc_server_thread(qmpc::ComputationToComputation::Server::runServer, ctc_my_ip_str); +// const std::string mtoc_ip_str("0.0.0.0:" + mtoc_ip.port); +// std::thread mc_server_thread(qmpc::ManageToComputation::runServer, mtoc_ip_str); +// QMPC_LOG_INFO("ip_addr: {}", ctc_my_ip_str); - // healthcheck 用のスレッド - std::vector healthcheck_threads; - // スレッドに渡す healthcheck 処理コード - auto do_healthcheck = [&](const Url &pt_url) - { - auto stub = createStub(pt_url); - for (;;) - { - grpc::ClientContext context; - grpc::health::v1::HealthCheckRequest request; - grpc::health::v1::HealthCheckResponse response; - const grpc::Status status = stub->Check(&context, request, &response); - if (status.ok() && response.status() == grpc::health::v1::HealthCheckResponse::SERVING) - { - break; - } - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - }; - // healthcheck スレッド立ち上げ - for (int pt_id = 1; pt_id <= conf->n_parties; ++pt_id) - { - if (pt_id != conf->party_id) - { - healthcheck_threads.emplace_back(std::thread(do_healthcheck, conf->ip_addr_map[pt_id])); - } - } - // healthcheck スレッド終了待機 - for (auto &th : healthcheck_threads) - { - th.join(); - } +// // healthcheck 用のスレッド +// std::vector healthcheck_threads; +// // スレッドに渡す healthcheck 処理コード +// auto do_healthcheck = [&](const Url &pt_url) +// { +// auto stub = createStub(pt_url); +// for (;;) +// { +// grpc::ClientContext context; +// grpc::health::v1::HealthCheckRequest request; +// grpc::health::v1::HealthCheckResponse response; +// const grpc::Status status = stub->Check(&context, request, &response); +// if (status.ok() && response.status() == grpc::health::v1::HealthCheckResponse::SERVING) +// { +// break; +// } +// std::this_thread::sleep_for(std::chrono::seconds(1)); +// } +// }; +// // healthcheck スレッド立ち上げ +// for (int pt_id = 1; pt_id <= conf->n_parties; ++pt_id) +// { +// if (pt_id != conf->party_id) +// { +// healthcheck_threads.emplace_back(std::thread(do_healthcheck, conf->ip_addr_map[pt_id])); +// } +// } +// // healthcheck スレッド終了待機 +// for (auto &th : healthcheck_threads) +// { +// th.join(); +// } - // 時間計測開始 - std::thread timekeeper_thread(timekeep); +// // 時間計測開始 +// std::thread timekeeper_thread(timekeep); - // インテグレーションテストを実行 - ::testing::InitGoogleTest(&argc, argv); - int ok = RUN_ALL_TESTS(); - if (ok == 0) - std::exit(EXIT_SUCCESS); - else - std::exit(EXIT_FAILURE); +// // インテグレーションテストを実行 +// ::testing::InitGoogleTest(&argc, argv); +// int ok = RUN_ALL_TESTS(); +// if (ok == 0) +// std::exit(EXIT_SUCCESS); +// else +// std::exit(EXIT_FAILURE); - cc_server_thread.join(); - mc_server_thread.join(); - timekeeper_thread.detach(); -} +// cc_server_thread.join(); +// mc_server_thread.join(); +// timekeeper_thread.detach(); +// } diff --git a/packages/server/computation_container/test/integration_test/math_test.hpp b/packages/server/computation_container/test/integration_test/math_test.hpp index b60edf22e..4dcc87481 100644 --- a/packages/server/computation_container/test/integration_test/math_test.hpp +++ b/packages/server/computation_container/test/integration_test/math_test.hpp @@ -7,261 +7,261 @@ #include "logging/logger.hpp" #include "math/math.hpp" -TEST(MathTest, Smean) -{ - Share a(FixedPoint("1.0")); - Share b(FixedPoint("2.0")); - Share c(FixedPoint("3.0")); - std::vector v(3); - v[0] = a; - v[1] = b; - v[2] = c; - - Share avg; - avg = qmpc::Math::smean(v); - FixedPoint avg_rec = open_and_recons(avg); - - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - FixedPoint expected(std::to_string((1.0 + 3.0) / 2.0 * n_parties)); - - QMPC_LOG_INFO("avg_rec: {}", avg_rec.getStrVal()); - EXPECT_NEAR(expected.getDoubleVal(), avg_rec.getDoubleVal(), 0.001); -} - -TEST(MathTest, Smean2) -{ - int n = 30000; - std::vector v(n); - - for (int i = 0; i < n; i++) - { - Share a(FixedPoint((long long int)i + 1)); - v[i] = a; - } - - Share avg; - avg = qmpc::Math::smean(v); - FixedPoint avg_rec = open_and_recons(avg); - - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - FixedPoint expected(std::to_string((1.0 + 30000.0) / 2.0 * n_parties)); - - QMPC_LOG_INFO("avg_rec: {}", avg_rec.getStrVal()); - EXPECT_NEAR(expected.getDoubleVal(), avg_rec.getDoubleVal(), 0.001); -} - -TEST(MathTest, Variance) -{ - Share a(FixedPoint("1.0")); - Share b(FixedPoint("2.0")); - Share c(FixedPoint("3.0")); - std::vector v(3); - v[0] = a; - v[1] = b; - v[2] = c; - - Share var; - var = qmpc::Math::variance(v); - FixedPoint var_rec = open_and_recons(var); - - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector v_double = {1.0, 2.0, 3.0}; - for (size_t i = 0; i < v_double.size(); i++) - { - v_double[i] = v_double[i] * n_parties; - } - double avg = (v_double.front() + v_double.back()) / 2.0; - double vari_sum = 0.0; - for (size_t i = 0; i < v_double.size(); i++) - { - vari_sum += (v_double[i] - avg) * (v_double[i] - avg); - } - FixedPoint expected(std::to_string(vari_sum / v_double.size())); - - QMPC_LOG_INFO("var_rec: {}", var_rec.getStrVal()); - EXPECT_NEAR(expected.getDoubleVal(), var_rec.getDoubleVal(), 0.001); -} - -TEST(MathTest, Variance2) -{ - int n = 30000; - std::vector v(n); - for (int i = 0; i < n; i++) - { - Share a(FixedPoint((long long int)i + 1)); - v[i] = a; - } - - Share var; - var = qmpc::Math::variance(v); - FixedPoint var_rec = open_and_recons(var); - - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector v_double(n); - for (int i = 0; i < n; i++) - { - v_double[i] = i * n_parties; - } - double avg = (v_double.front() + v_double.back()) / 2.0; - double vari_sum = 0.0; - for (int i = 0; i < n; i++) - { - vari_sum += (v_double[i] - avg) * (v_double[i] - avg); - } - FixedPoint expected(std::to_string(vari_sum / v_double.size())); - - QMPC_LOG_INFO("var_rec: {}", var_rec.getStrVal()); - EXPECT_NEAR(expected.getDoubleVal(), var_rec.getDoubleVal(), 0.001); -} - -TEST(MathTest, Stdev) -{ - Share a(FixedPoint("1.0")); - Share b(FixedPoint("2.0")); - Share c(FixedPoint("3.0")); - std::vector v(3); - v[0] = a; - v[1] = b; - v[2] = c; - FixedPoint target = qmpc::Math::stdev(v); - - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector v_double = {1.0, 2.0, 3.0}; - for (size_t i = 0; i < v_double.size(); i++) - { - v_double[i] = v_double[i] * n_parties; - } - double avg = (v_double.front() + v_double.back()) / 2.0; - double vari_sum = 0.0; - for (size_t i = 0; i < v_double.size(); i++) - { - vari_sum += (v_double[i] - avg) * (v_double[i] - avg); - } - double dev = std::sqrt(vari_sum / v_double.size()); - FixedPoint expected(std::to_string(dev)); - - EXPECT_NEAR(expected.getDoubleVal(), target.getDoubleVal(), 0.01); -} - -TEST(MathTest, Correl) -{ - std::vector x = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("5.0")}; - std::vector y = {FixedPoint("10.0"), FixedPoint("5.0"), FixedPoint("6.0")}; - Share correl_rec = qmpc::Math::correl(x, y); - FixedPoint target = open_and_recons(correl_rec); - - FixedPoint expected("-0.54470478"); - - EXPECT_NEAR(expected.getDoubleVal(), target.getDoubleVal(), 0.01); -} - -TEST(MathTest, Correl_0div) -{ - std::vector x = {FixedPoint("2.0"), FixedPoint("2.0"), FixedPoint("2.0")}; - std::vector y = {FixedPoint("10.0"), FixedPoint("10.0"), FixedPoint("10.0")}; - - Share correl_rec = qmpc::Math::correl(x, y); - FixedPoint target = open_and_recons(correl_rec); - EXPECT_NEAR(target.getDoubleVal(), 0.0, 0.001); -} - -TEST(MathTest, Correl_size) -{ - std::vector x = {FixedPoint("2.0"), FixedPoint("2.0")}; - std::vector y = {FixedPoint("10.0"), FixedPoint("5.0"), FixedPoint("6.0")}; - - try - { - qmpc::Math::correl(x, y); - } - catch (std::exception e) - { - QMPC_LOG_INFO(e.what()); - EXPECT_TRUE(true); - QMPC_LOG_INFO("TestCorrel_size \033[32m Succeed \033[m"); - return; - } - EXPECT_TRUE(false); - QMPC_LOG_INFO("TestCorrel_size \033[32m Fail \033[m"); -} - -// 28000個の要素を持つベクトル2つの相関係数の計算時間測定 -TEST(MathTest, Correl_large) -{ - constexpr int MIN = 0; - constexpr int MAX = 1; - constexpr int N = 28000; - - std::vector x(N); - std::vector y(N); - - std::random_device rd; - std::default_random_engine eng(rd()); - std::uniform_real_distribution distr(MIN, MAX); - - for (int i = 0; i < N; ++i) - { - x[i] = FixedPoint(distr(eng)); - y[i] = FixedPoint(distr(eng)); - } - - auto start = std::chrono::system_clock::now(); - - Share correl = qmpc::Math::correl(x, y); - FixedPoint correl_rec = open_and_recons(correl); - - auto end = std::chrono::system_clock::now(); - auto dur = end - start; - - // 計算に要した時間をミリ秒（1/1000秒）に変換して表示 - auto msec = std::chrono::duration_cast(dur).count(); - - QMPC_LOG_INFO("28000個の要素を持つベクトル2つの相関係数の計算時間: {} milli sec", msec); - QMPC_LOG_INFO(correl_rec.getStrVal()); -} - -TEST(MathTest, ExpTest) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - - // x = n_parties; - Share x{1}; - auto start = std::chrono::system_clock::now(); - - auto exp_n = qmpc::Math::exp(x); - double expect = std::exp(n_parties); - auto exp_n_rec = open_and_recons(exp_n); - auto end = std::chrono::system_clock::now(); - auto dur = end - start; - - // 計算に要した時間をミリ秒（1/1000秒）に変換して表示 - auto msec = std::chrono::duration_cast(dur).count(); - - QMPC_LOG_INFO("share exp time is {}", msec); - QMPC_LOG_INFO("share exp_n is {}", exp_n_rec); - QMPC_LOG_INFO("expect exp_n is {}", expect); - - EXPECT_NEAR(expect, exp_n_rec.getDoubleVal(), 0.001); -} -TEST(MathTest, correlVecExceptionTest) -{ - constexpr int N = 28000; - - std::vector x(N); - std::vector y(N); - y.pop_back(); - try - { - Share correl = qmpc::Math::correl(x, y); - } - catch (std::exception &e) - { - QMPC_LOG_ERROR("{} | {}", *boost::get_error_info(e), e.what()); - } -} \ No newline at end of file +// TEST(MathTest, Smean) +// { +// Share a(FixedPoint("1.0")); +// Share b(FixedPoint("2.0")); +// Share c(FixedPoint("3.0")); +// std::vector v(3); +// v[0] = a; +// v[1] = b; +// v[2] = c; + +// Share avg; +// avg = qmpc::Math::smean(v); +// FixedPoint avg_rec = open_and_recons(avg); + +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// FixedPoint expected(std::to_string((1.0 + 3.0) / 2.0 * n_parties)); + +// QMPC_LOG_INFO("avg_rec: {}", avg_rec.getStrVal()); +// EXPECT_NEAR(expected.getDoubleVal(), avg_rec.getDoubleVal(), 0.001); +// } + +// TEST(MathTest, Smean2) +// { +// int n = 30000; +// std::vector v(n); + +// for (int i = 0; i < n; i++) +// { +// Share a(FixedPoint((long long int)i + 1)); +// v[i] = a; +// } + +// Share avg; +// avg = qmpc::Math::smean(v); +// FixedPoint avg_rec = open_and_recons(avg); + +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// FixedPoint expected(std::to_string((1.0 + 30000.0) / 2.0 * n_parties)); + +// QMPC_LOG_INFO("avg_rec: {}", avg_rec.getStrVal()); +// EXPECT_NEAR(expected.getDoubleVal(), avg_rec.getDoubleVal(), 0.001); +// } + +// TEST(MathTest, Variance) +// { +// Share a(FixedPoint("1.0")); +// Share b(FixedPoint("2.0")); +// Share c(FixedPoint("3.0")); +// std::vector v(3); +// v[0] = a; +// v[1] = b; +// v[2] = c; + +// Share var; +// var = qmpc::Math::variance(v); +// FixedPoint var_rec = open_and_recons(var); + +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector v_double = {1.0, 2.0, 3.0}; +// for (size_t i = 0; i < v_double.size(); i++) +// { +// v_double[i] = v_double[i] * n_parties; +// } +// double avg = (v_double.front() + v_double.back()) / 2.0; +// double vari_sum = 0.0; +// for (size_t i = 0; i < v_double.size(); i++) +// { +// vari_sum += (v_double[i] - avg) * (v_double[i] - avg); +// } +// FixedPoint expected(std::to_string(vari_sum / v_double.size())); + +// QMPC_LOG_INFO("var_rec: {}", var_rec.getStrVal()); +// EXPECT_NEAR(expected.getDoubleVal(), var_rec.getDoubleVal(), 0.001); +// } + +// TEST(MathTest, Variance2) +// { +// int n = 30000; +// std::vector v(n); +// for (int i = 0; i < n; i++) +// { +// Share a(FixedPoint((long long int)i + 1)); +// v[i] = a; +// } + +// Share var; +// var = qmpc::Math::variance(v); +// FixedPoint var_rec = open_and_recons(var); + +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector v_double(n); +// for (int i = 0; i < n; i++) +// { +// v_double[i] = i * n_parties; +// } +// double avg = (v_double.front() + v_double.back()) / 2.0; +// double vari_sum = 0.0; +// for (int i = 0; i < n; i++) +// { +// vari_sum += (v_double[i] - avg) * (v_double[i] - avg); +// } +// FixedPoint expected(std::to_string(vari_sum / v_double.size())); + +// QMPC_LOG_INFO("var_rec: {}", var_rec.getStrVal()); +// EXPECT_NEAR(expected.getDoubleVal(), var_rec.getDoubleVal(), 0.001); +// } + +// TEST(MathTest, Stdev) +// { +// Share a(FixedPoint("1.0")); +// Share b(FixedPoint("2.0")); +// Share c(FixedPoint("3.0")); +// std::vector v(3); +// v[0] = a; +// v[1] = b; +// v[2] = c; +// FixedPoint target = qmpc::Math::stdev(v); + +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector v_double = {1.0, 2.0, 3.0}; +// for (size_t i = 0; i < v_double.size(); i++) +// { +// v_double[i] = v_double[i] * n_parties; +// } +// double avg = (v_double.front() + v_double.back()) / 2.0; +// double vari_sum = 0.0; +// for (size_t i = 0; i < v_double.size(); i++) +// { +// vari_sum += (v_double[i] - avg) * (v_double[i] - avg); +// } +// double dev = std::sqrt(vari_sum / v_double.size()); +// FixedPoint expected(std::to_string(dev)); + +// EXPECT_NEAR(expected.getDoubleVal(), target.getDoubleVal(), 0.01); +// } + +// TEST(MathTest, Correl) +// { +// std::vector x = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("5.0")}; +// std::vector y = {FixedPoint("10.0"), FixedPoint("5.0"), FixedPoint("6.0")}; +// Share correl_rec = qmpc::Math::correl(x, y); +// FixedPoint target = open_and_recons(correl_rec); + +// FixedPoint expected("-0.54470478"); + +// EXPECT_NEAR(expected.getDoubleVal(), target.getDoubleVal(), 0.01); +// } + +// TEST(MathTest, Correl_0div) +// { +// std::vector x = {FixedPoint("2.0"), FixedPoint("2.0"), FixedPoint("2.0")}; +// std::vector y = {FixedPoint("10.0"), FixedPoint("10.0"), FixedPoint("10.0")}; + +// Share correl_rec = qmpc::Math::correl(x, y); +// FixedPoint target = open_and_recons(correl_rec); +// EXPECT_NEAR(target.getDoubleVal(), 0.0, 0.001); +// } + +// TEST(MathTest, Correl_size) +// { +// std::vector x = {FixedPoint("2.0"), FixedPoint("2.0")}; +// std::vector y = {FixedPoint("10.0"), FixedPoint("5.0"), FixedPoint("6.0")}; + +// try +// { +// qmpc::Math::correl(x, y); +// } +// catch (std::exception e) +// { +// QMPC_LOG_INFO(e.what()); +// EXPECT_TRUE(true); +// QMPC_LOG_INFO("TestCorrel_size \033[32m Succeed \033[m"); +// return; +// } +// EXPECT_TRUE(false); +// QMPC_LOG_INFO("TestCorrel_size \033[32m Fail \033[m"); +// } + +// // 28000個の要素を持つベクトル2つの相関係数の計算時間測定 +// TEST(MathTest, Correl_large) +// { +// constexpr int MIN = 0; +// constexpr int MAX = 1; +// constexpr int N = 28000; + +// std::vector x(N); +// std::vector y(N); + +// std::random_device rd; +// std::default_random_engine eng(rd()); +// std::uniform_real_distribution distr(MIN, MAX); + +// for (int i = 0; i < N; ++i) +// { +// x[i] = FixedPoint(distr(eng)); +// y[i] = FixedPoint(distr(eng)); +// } + +// auto start = std::chrono::system_clock::now(); + +// Share correl = qmpc::Math::correl(x, y); +// FixedPoint correl_rec = open_and_recons(correl); + +// auto end = std::chrono::system_clock::now(); +// auto dur = end - start; + +// // 計算に要した時間をミリ秒（1/1000秒）に変換して表示 +// auto msec = std::chrono::duration_cast(dur).count(); + +// QMPC_LOG_INFO("28000個の要素を持つベクトル2つの相関係数の計算時間: {} milli sec", msec); +// QMPC_LOG_INFO(correl_rec.getStrVal()); +// } + +// TEST(MathTest, ExpTest) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; + +// // x = n_parties; +// Share x{1}; +// auto start = std::chrono::system_clock::now(); + +// auto exp_n = qmpc::Math::exp(x); +// double expect = std::exp(n_parties); +// auto exp_n_rec = open_and_recons(exp_n); +// auto end = std::chrono::system_clock::now(); +// auto dur = end - start; + +// // 計算に要した時間をミリ秒（1/1000秒）に変換して表示 +// auto msec = std::chrono::duration_cast(dur).count(); + +// QMPC_LOG_INFO("share exp time is {}", msec); +// QMPC_LOG_INFO("share exp_n is {}", exp_n_rec); +// QMPC_LOG_INFO("expect exp_n is {}", expect); + +// EXPECT_NEAR(expect, exp_n_rec.getDoubleVal(), 0.001); +// } +// TEST(MathTest, correlVecExceptionTest) +// { +// constexpr int N = 28000; + +// std::vector x(N); +// std::vector y(N); +// y.pop_back(); +// try +// { +// Share correl = qmpc::Math::correl(x, y); +// } +// catch (std::exception &e) +// { +// QMPC_LOG_ERROR("{} | {}", *boost::get_error_info(e), e.what()); +// } +// } \ No newline at end of file diff --git a/packages/server/computation_container/test/integration_test/read_triple_from_bts_test.hpp b/packages/server/computation_container/test/integration_test/read_triple_from_bts_test.hpp index 824b5dbd2..e8e575785 100644 --- a/packages/server/computation_container/test/integration_test/read_triple_from_bts_test.hpp +++ b/packages/server/computation_container/test/integration_test/read_triple_from_bts_test.hpp @@ -24,7 +24,7 @@ void readTriplesTest(const unsigned int jobIdMax, const unsigned int amount) for (unsigned int jobId = 1; jobId <= jobIdMax; jobId++) { QMPC_LOG_INFO("jobId[{}]: ...", jobId); - using JobTriple = qmpc::BtsHandler::BTSJobType::Triple; + using JobTriple = qmpc::BtsHandler::BTSJobType::Triple; auto triples = cc_to_bts->readRequest(amount); EXPECT_EQ(triples.size(), amount); // TODO: Party間で足並みを揃えてa*b=cのチェック diff --git a/packages/server/computation_container/test/integration_test/share_test.hpp b/packages/server/computation_container/test/integration_test/share_test.hpp index 65d8fec2a..6d54dc461 100644 --- a/packages/server/computation_container/test/integration_test/share_test.hpp +++ b/packages/server/computation_container/test/integration_test/share_test.hpp @@ -13,1025 +13,1025 @@ #include "share/share.hpp" #include "unistd.h" -TEST(ShareTest, IncrementShareId) -{ - Share a(FixedPoint("3.0")); - Share b(FixedPoint("3.0")); - int diff = b.getId().getShareId() - a.getId().getShareId(); - EXPECT_EQ(diff, 1); -} - -TEST(ShareTest, GetShareValue) -{ - Share a(FixedPoint("3.0")); - EXPECT_EQ(a.getVal(), FixedPoint("3.0")); -} - -TEST(ShareTest, AddBetweenShares) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("1.0")); - Share b(FixedPoint("2.0")); - a = a + b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(3.0 * n_parties))); -} - -TEST(ShareTest, SubBetweenShares) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("2.0")); - Share b(FixedPoint("1.0")); - a = a - b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties))); -} - -TEST(ShareTest, MulBetweenShares) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("3.0")); - Share b(FixedPoint("3.0")); - a = a * b; - FixedPoint a_rec = open_and_recons(a); - QMPC_LOG_INFO("a_rec = {}", a_rec.getDoubleVal()); - EXPECT_EQ(a_rec, FixedPoint(std::to_string((3.0 * n_parties) * (3.0 * n_parties)))); -} - -TEST(ShareTest, AddBetweenShareAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("1.0")); - FixedPoint b("2.0"); - a = a + b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties + 2.0))); -} - -TEST(ShareTest, SubBetweenShareAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("10.0")); - FixedPoint b("2.0"); - a = a - b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(10.0 * n_parties - 2.0))); -} - -TEST(ShareTest, MulBetweenShareAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("2.0")); - FixedPoint b("3.0"); - a = a * b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(2.0 * n_parties * 3.0))); -} - -TEST(ShareTest, DivBetweenShareAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("1.0")); - FixedPoint b("2.0"); - a = a / b; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties / 2.0))); -} - -// 各要素の加法に関する逆元を一括で求めるテスト -TEST(ShareTest, GetAdditiveInvVec) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = { - Share(FixedPoint("5")), - Share(FixedPoint("3.6")), - Share(FixedPoint("-6")), - Share(FixedPoint("-4.2")), - Share(FixedPoint("0"))}; - a = getAdditiveInvVec(a); - std::vector expected = { - (-5.0 * n_parties), (-3.6 * n_parties), (6.0 * n_parties), (4.2 * n_parties), 0}; - std::vector ret = open_and_recons(a); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_EQ(expected[i], ret[i].getDoubleVal()); - } -} - -TEST(ShareTest, AddBetweenSharesAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = { - Share(FixedPoint("5")), - Share(FixedPoint("3.6")), - Share(FixedPoint("-6")), - Share(FixedPoint("-4.2"))}; - FixedPoint b("2.0"); - std::vector expected = { - 5.0 * n_parties + 2.0, - 3.6 * n_parties + 2.0, - -6.0 * n_parties + 2.0, - -4.2 * n_parties + 2.0}; - std::vector c = a + b; - std::vector ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } - - c = b + a; - ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } -} - -TEST(ShareTest, SubBetweenSharesAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = { - Share(FixedPoint("5")), - Share(FixedPoint("3.6")), - Share(FixedPoint("-6")), - Share(FixedPoint("-4.2"))}; - FixedPoint b("2.0"); - std::vector expected = { - 5.0 * n_parties - 2.0, - 3.6 * n_parties - 2.0, - -6.0 * n_parties - 2.0, - -4.2 * n_parties - 2.0}; - std::vector c = a - b; - std::vector ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } - - c = b - a; - ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(-expected[i], ret[i].getDoubleVal(), 0.1); - } -} - -TEST(ShareTest, MulBetweenSharesAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = { - Share(FixedPoint("5")), - Share(FixedPoint("3.6")), - Share(FixedPoint("-6")), - Share(FixedPoint("-4.2"))}; - FixedPoint b("2.0"); - std::vector expected = { - 5.0 * n_parties * 2.0, - 3.6 * n_parties * 2.0, - -6.0 * n_parties * 2.0, - -4.2 * n_parties * 2.0}; - std::vector c = a * b; - std::vector ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } - - c = b * a; - ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } -} - -TEST(ShareTest, DivBetweenSharesAndFixedPoint) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = { - Share(FixedPoint("5")), - Share(FixedPoint("3.6")), - Share(FixedPoint("-6")), - Share(FixedPoint("-4.2"))}; - FixedPoint b("2.0"); - std::vector expected = { - 5.0 * n_parties / 2.0, - 3.6 * n_parties / 2.0, - -6.0 * n_parties / 2.0, - -4.2 * n_parties / 2.0}; - std::vector c = a / b; - std::vector ret = open_and_recons(c); - for (int i = 0; i < static_cast(a.size()); ++i) - { - EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); - } -} - -TEST(ShareTest, AddBetweenFixedPointAndShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("1.0")); - FixedPoint b("2.0"); - a = b + a; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(2 + n_parties))); -} - -TEST(ShareTest, SubBetweenFixedPointAndShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("2.0")); - FixedPoint b("10.0"); - a = b - a; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(10 - (2 * n_parties)))); -} - -TEST(ShareTest, MulBetweenFixedPointAndShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("2.0")); - FixedPoint b("3.0"); - a = b * a; - FixedPoint a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, FixedPoint(std::to_string(3 * (2 * n_parties)))); -} -TEST(ShareTest, RandBitShare) -{ - int N = 5; - for (int i = 0; i < N; ++i) - { - Share a = qmpc::Share::getRandBitShare(); - FixedPoint a_rec = open_and_recons(a); - QMPC_LOG_INFO("RandBit = {}", a_rec.getDoubleVal()); - bool left = (-0.01 < a_rec.getDoubleVal()) && (a_rec.getDoubleVal() < 0.01); - bool right = (0.99 < a_rec.getDoubleVal()) && (a_rec.getDoubleVal() < 1.01); - EXPECT_TRUE(left || right) << "a_rec = " << a_rec; - } -} - -// 一括RandBitShareのテスト -TEST(ShareTest, BulkRandBitShare) -{ - int N = 5; - std::vector a = qmpc::Share::getRandBitShare(N); - std::vector a_rec = open_and_recons(a); - for (int i = 0; i < N; ++i) - { - QMPC_LOG_INFO("RandBit = {}", a_rec[i].getDoubleVal()); - bool left = (-0.01 < a_rec[i].getDoubleVal()) && (a_rec[i].getDoubleVal() < 0.01); - bool right = (0.99 < a_rec[i].getDoubleVal()) && (a_rec[i].getDoubleVal() < 1.01); - EXPECT_TRUE(left || right) << "a_rec = " << a_rec[i]; - } -} - -TEST(ShareTest, LSBShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("5")), - Share(FixedPoint("6")), - Share(FixedPoint("7.1")), - Share(FixedPoint("7.4"))}; - std::vector> expected = { - {5.0 * n_parties, (double)(5 * n_parties % 2)}, - {6.0 * n_parties, (double)(6 * n_parties % 2)}, - {7.1 * n_parties, fmod(round(7.1 * n_parties), 2)}, - {7.4 * n_parties, fmod(round(7.4 * n_parties), 2)}}; - double error = 0.0001; - for (int i = 0; i < static_cast(s.size()); ++i) - { - Share lsb = qmpc::Share::getLSBShare(s[i]); - FixedPoint lsb_rec = open_and_recons(lsb); - QMPC_LOG_INFO("LSB({}) = {}", expected[i][0], lsb_rec.getDoubleVal()); - EXPECT_NEAR(expected[i][1], lsb_rec.getDoubleVal(), error); - } -} - -// 一括LSBShareのテスト -TEST(ShareTest, BulkLSBShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("5")), - Share(FixedPoint("6")), - Share(FixedPoint("7.1")), - Share(FixedPoint("7.4"))}; - std::vector> expected = { - {5.0 * n_parties, (double)(5 * n_parties % 2)}, - {6.0 * n_parties, (double)(6 * n_parties % 2)}, - {7.1 * n_parties, fmod(round(7.1 * n_parties), 2)}, - {7.4 * n_parties, fmod(round(7.4 * n_parties), 2)}}; - double error = 0.0001; - - std::vector lsb = qmpc::Share::getLSBShare(s); - std::vector lsb_rec = open_and_recons(lsb); - for (int i = 0; i < static_cast(s.size()); ++i) - { - QMPC_LOG_INFO("LSB({}) = {}", expected[i][0], lsb_rec[i].getDoubleVal()); - EXPECT_NEAR(expected[i][1], lsb_rec[i].getDoubleVal(), error); - } -} - -TEST(ShareTest, Floor) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("3.5")), - Share(FixedPoint("9.26")), - Share(FixedPoint("4.6666")), - Share(FixedPoint("4.6667")), - Share(FixedPoint("3.0")), - Share(FixedPoint("-3.5")), - Share(FixedPoint("-9.26")), - Share(FixedPoint("-4.6666")), - Share(FixedPoint("-4.6667")), - Share(FixedPoint("-3.0")), - }; - - // [(floor 未適用の値, floor 適用した値)] - std::vector> expected = { - {3.5 * n_parties, floor(3.5 * n_parties)}, - {9.26 * n_parties, floor(9.26 * n_parties)}, - {4.6666 * n_parties, floor(4.6666 * n_parties)}, - {4.6667 * n_parties, floor(4.6667 * n_parties)}, - {3.0 * n_parties, floor(3.0 * n_parties)}, - {-3.5 * n_parties, floor(-3.5 * n_parties)}, - {-9.26 * n_parties, floor(-9.26 * n_parties)}, - {-4.6666 * n_parties, floor(-4.6666 * n_parties)}, - {-4.6667 * n_parties, floor(-4.6667 * n_parties)}, - {-3.0 * n_parties, floor(-3.0 * n_parties)}, - }; - double error = 0.0001; - for (int i = 0; i < static_cast(s.size()); ++i) - { - Share s_floor = qmpc::Share::getFloor(s[i]); - FixedPoint result = open_and_recons(s_floor); - QMPC_LOG_INFO("floor({}) = {}", expected[i][0], result); - EXPECT_NEAR(expected[i][1], result.getDoubleVal(), error); - } -} - -// 一括Floorのテスト -TEST(ShareTest, BulkFloor) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("3.5")), - Share(FixedPoint("9.26")), - Share(FixedPoint("4.6666")), - Share(FixedPoint("4.6667")), - Share(FixedPoint("3.0")), - Share(FixedPoint("-3.5")), - Share(FixedPoint("-9.26")), - Share(FixedPoint("-4.6666")), - Share(FixedPoint("-4.6667")), - Share(FixedPoint("-3.0")), - }; - - // [(floor 未適用の値, floor 適用した値)] - std::vector> expected = { - {3.5 * n_parties, floor(3.5 * n_parties)}, - {9.26 * n_parties, floor(9.26 * n_parties)}, - {4.6666 * n_parties, floor(4.6666 * n_parties)}, - {4.6667 * n_parties, floor(4.6667 * n_parties)}, - {3.0 * n_parties, floor(3.0 * n_parties)}, - {-3.5 * n_parties, floor(-3.5 * n_parties)}, - {-9.26 * n_parties, floor(-9.26 * n_parties)}, - {-4.6666 * n_parties, floor(-4.6666 * n_parties)}, - {-4.6667 * n_parties, floor(-4.6667 * n_parties)}, - {-3.0 * n_parties, floor(-3.0 * n_parties)}}; - double error = 0.0001; - - std::vector s_floor = qmpc::Share::getFloor(s); - std::vector result = open_and_recons(s_floor); - for (int i = 0; i < static_cast(s.size()); ++i) - { - QMPC_LOG_INFO("floor({}) = {}", expected[i][0], result[i]); - EXPECT_NEAR(expected[i][1], result[i].getDoubleVal(), error); - } -} - -// LTZ (Less Than Zero) -TEST(ShareTest, LTZ) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("3.0")), - Share(FixedPoint("-3.0")), - Share(FixedPoint("10.5")), - Share(FixedPoint("-10.5")), - Share(FixedPoint("10250.4")), - Share(FixedPoint("-10250.4")), - Share(FixedPoint("0.0")), - Share(FixedPoint("0.01")), - Share(FixedPoint("0.0001")), - Share(FixedPoint("-0.01")), - Share(FixedPoint("-0.0001")), - }; - - // [(真値, LTZ の結果)] - std::vector> expected = { - {3.0 * n_parties, 0}, - {-3.0 * n_parties, 1}, - {10.5 * n_parties, 0}, - {-10.5 * n_parties, 1}, - {10250.4 * n_parties, 0}, - {-10250.4 * n_parties, 1}, - {0.0, 0}, - {0.01 * n_parties, 0}, - {0.0001 * n_parties, 0}, - {-0.01 * n_parties, 1}, - {-0.0001 * n_parties, 1}, - }; - double error = 0.00001; - for (int i = 0; i < static_cast(s.size()); ++i) - { - Share s_ltz = qmpc::Share::LTZ(s[i]); - FixedPoint result = open_and_recons(s_ltz); - QMPC_LOG_INFO("[{}<0] {}", expected[i][0], result); - EXPECT_NEAR(result.getDoubleVal(), expected[i][1], error); - } -} - -TEST(ShareTest, LTZBulk) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector s = { - Share(FixedPoint("3.0")), - Share(FixedPoint("-3.0")), - Share(FixedPoint("10.5")), - Share(FixedPoint("-10.5")), - Share(FixedPoint("10250.4")), - Share(FixedPoint("-10250.4")), - Share(FixedPoint("0.0")), - Share(FixedPoint("0.01")), - Share(FixedPoint("0.0001")), - Share(FixedPoint("-0.01")), - Share(FixedPoint("-0.0001")), - }; - - // [(真値, LTZ の結果)] - std::vector> expected = { - {3.0 * n_parties, 0}, - {-3.0 * n_parties, 1}, - {10.5 * n_parties, 0}, - {-10.5 * n_parties, 1}, - {10250.4 * n_parties, 0}, - {-10250.4 * n_parties, 1}, - {0.0, 0}, - {0.01 * n_parties, 0}, - {0.0001 * n_parties, 0}, - {-0.01 * n_parties, 1}, - {-0.0001 * n_parties, 1}, - }; - double error = 0.00001; - auto s_ltz = qmpc::Share::LTZ(s); - auto result = open_and_recons(s_ltz); - for (int i = 0; i < static_cast(s.size()); ++i) - { - QMPC_LOG_INFO("[{}<0] {}", expected[i][0], result[i]); - EXPECT_NEAR(result[i].getDoubleVal(), expected[i][1], error); - } -} - -// Share(とFixedPoint)での比較が可能かテストする -TEST(ShareTest, ComparisonOperation) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - Share a(FixedPoint("2.0")); - Share b(FixedPoint("3.0")); - Share c(FixedPoint("3.0")); - FixedPoint d(std::to_string(3.0 * n_parties)); - - EXPECT_TRUE(a < b); - EXPECT_TRUE(!(a > b)); - EXPECT_TRUE(a <= b); - EXPECT_TRUE(!(a >= b)); - EXPECT_TRUE(a != b); - EXPECT_TRUE(b == c); - EXPECT_TRUE(a < d); - EXPECT_TRUE(!(a > d)); - EXPECT_TRUE(a <= d); - EXPECT_TRUE(!(a >= d)); - EXPECT_TRUE(c == d); - EXPECT_TRUE(c <= d); - EXPECT_TRUE(c >= d); - EXPECT_TRUE(d > a); - EXPECT_TRUE(!(d < a)); - EXPECT_TRUE(d >= a); - EXPECT_TRUE(!(d <= a)); - EXPECT_TRUE(d != a); - EXPECT_TRUE(d == c); - EXPECT_TRUE(d <= c); - EXPECT_TRUE(d >= c); -} - -TEST(ShareTest, ComparisonOperationBulk) -{ - Share a(FixedPoint("2.0")); - Share b(FixedPoint("3.0")); - std::vector l{a, a, b, b}; - std::vector r{a, b, a, b}; - - // < - auto lt = allLess(l, r); - std::vector lt_t{false, true, false, false}; - EXPECT_EQ(lt, lt_t); - - // > - auto gt = allGreater(l, r); - std::vector gt_t{false, false, true, false}; - EXPECT_EQ(gt, gt_t); - - // <= - auto lte = allLessEq(l, r); - std::vector lte_t{true, true, false, true}; - EXPECT_EQ(lte, lte_t); - - // >= - auto gte = allGreaterEq(l, r); - std::vector gte_t{true, false, true, true}; - EXPECT_EQ(gte, gte_t); - - // == - auto eq = allEq(l, r); - std::vector eq_t{true, false, false, true}; - EXPECT_EQ(eq, eq_t); -} - -TEST(ShareTest, EqualityEpsilonRandomTest) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - - // m,k is LTZ parameters - int m = 20; - int k = 48; - std::vector> random_range{ - {1, 10}, // small case - {1LL << (k - 1), (1LL << k) - 20}}; // large case - for (const auto &[lower, upper] : random_range) - { - for (int _ = 0; _ < 10; ++_) - { - auto val1 = RandGenerator::getInstance()->getRand(lower, upper); - auto val2 = val1 + 1; - - auto val_d1 = static_cast(val1) / (1LL << (m - 3)) / n_parties; - auto val_d2 = static_cast(val2) / (1LL << (m - 3)) / n_parties; - - auto s1 = Share(FixedPoint((boost::format("%.10f") % val_d1).str())); - auto s2 = Share(FixedPoint((boost::format("%.10f") % val_d2).str())); - - EXPECT_TRUE(s1 == s1); - EXPECT_FALSE(s1 == s2); - } - } -} - -// ランダムな値で比較演算のテストを実行 -TEST(ShareTest, RandomComparisonOperation) -{ - { - // Share と Share の比較 - Share a_share(RandGenerator::getInstance()->getRand(-10000, 10000)); - Share b_share(RandGenerator::getInstance()->getRand(-10000, 10000)); - QMPC_LOG_INFO("a_share is {}", a_share.getVal()); - QMPC_LOG_INFO("b_share is {}", b_share.getVal()); - FixedPoint a_rec = open_and_recons(a_share); - FixedPoint b_rec = open_and_recons(b_share); - - if (a_rec < b_rec) - { - EXPECT_LT(a_share, b_share); - } - else if (a_rec > b_rec) - { - EXPECT_GT(a_share, b_share); - } - else - { - EXPECT_EQ(a_share, b_share); - } - } - QMPC_LOG_INFO("one step !!"); - // Share と FixedPoint の比較 - { - Share a_share(RandGenerator::getInstance()->getRand(1, 1000)); - FixedPoint a_rec = open_and_recons(a_share); - FixedPoint target = FixedPoint("0"); - QMPC_LOG_INFO("a_rec = \t{}", a_rec.getVal()); - QMPC_LOG_INFO("target = \t{}", target.getVal()); - if (a_rec < target) - { - EXPECT_LT(a_share, target); - } - else if (a_rec > target) - { - EXPECT_GT(a_share, target); - } - else - { - EXPECT_EQ(a_share, target); - } - } - QMPC_LOG_INFO("two step !!"); - // FixedPoint と Share の比較 - { - Share a_share(RandGenerator::getInstance()->getRand(1, 1000)); - FixedPoint a_rec = open_and_recons(a_share); - FixedPoint target = FixedPoint("0"); - QMPC_LOG_INFO("a_rec = \t{}", a_rec.getVal()); - QMPC_LOG_INFO("target = \t{}", target.getVal()); - if (target < a_rec) - { - EXPECT_LT(target, a_share); - } - else if (target > a_rec) - { - EXPECT_GT(target, a_share); - } - else - { - EXPECT_EQ(target, a_share); - } - } -} - -// 定数値Shareテスト -TEST(ShareTest, ConstantShare) -{ - auto fp = FixedPoint("12"); - auto s = qmpc::Share::getConstantShare(fp); - auto fp_r = open_and_recons(s); - EXPECT_EQ(fp, fp_r); -} - -// 一括open_and_reconsテスト -TEST(ShareTest, ReconsBulk) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector t = {FixedPoint("1"), FixedPoint("2"), FixedPoint("3")}; - std::vector expected = { - FixedPoint(std::to_string(n_parties)), - FixedPoint(std::to_string(2.0 * n_parties)), - FixedPoint(std::to_string(3.0 * n_parties))}; - auto target = open_and_recons(t); - bool ng = false; - - for (int i = 0; i < static_cast(t.size()); ++i) - { - if (expected[i] - target[i] <= FixedPoint("-0.00001") - or expected[i] - target[i] >= FixedPoint("0.00001")) - { - ng = true; - } - } - - EXPECT_TRUE(not ng); -} - -// 一括加算のテスト -TEST(ShareTest, AddBulk) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; - std::vector b = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; - std::vector expected = { - FixedPoint(std::to_string(2.0 * n_parties)), - FixedPoint(std::to_string(4.0 * n_parties)), - FixedPoint(std::to_string(6.0 * n_parties))}; - auto ret = a + b; - auto target = open_and_recons(ret); - - QMPC_LOG_INFO("AddBulk End !!"); - EXPECT_EQ(target, expected); -} - -// 一括減算のテスト -TEST(ShareTest, SubBulk) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = {FixedPoint("3.0"), FixedPoint("2.0"), FixedPoint("9.0")}; - std::vector b = {FixedPoint("1.0"), FixedPoint("6.0"), FixedPoint("3.0")}; - std::vector expected = { - FixedPoint(std::to_string(2.0 * n_parties)), - FixedPoint(std::to_string(-4.0 * n_parties)), - FixedPoint(std::to_string(6.0 * n_parties))}; - auto ret = a - b; - auto target = open_and_recons(ret); - - QMPC_LOG_INFO("SubBulk End !!"); - EXPECT_EQ(target, expected); -} - -// 一括乗算のテスト -TEST(ShareTest, MulBulk) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector a = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; - std::vector b = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; - std::vector expected = { - FixedPoint(std::to_string(n_parties * n_parties)), - FixedPoint(std::to_string((2.0 * n_parties) * (2.0 * n_parties))), - FixedPoint(std::to_string((3.0 * n_parties) * (3.0 * n_parties)))}; - auto ret = a * b; - auto target = open_and_recons(ret); - bool ng = false; - - QMPC_LOG_INFO("MulBulk End !!"); - for (int i = 0; i < static_cast(a.size()); ++i) - { - QMPC_LOG_INFO(target[i].getStrVal()); - if (expected[i] - target[i] <= FixedPoint("-0.00001") - or expected[i] - target[i] >= FixedPoint("0.00001")) - { - ng = true; - } - } - - EXPECT_TRUE(not ng); -} - -// Share_Id 同時実行 -TEST(ShareTest, SameShareId) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - FixedPoint ret1, ret2; - std::thread th1( - [&]() - { - qmpc::Share::AddressId::setJobId(0); - Share a(1); - ret1 = open_and_recons(a); - QMPC_LOG_INFO("Firset thread is {}", ret1.getVal()); - QMPC_LOG_INFO("First ID is {}", a.getId()); - } - ); - std::thread th2( - [&]() - { - qmpc::Share::AddressId::setJobId(1); - Share a(0); - ret2 = open_and_recons(a); - QMPC_LOG_INFO("Second thread is {}", ret2.getVal()); - QMPC_LOG_INFO("Second ID is {}", a.getId()); - } - ); - th1.join(); - th2.join(); - - EXPECT_EQ(ret1, FixedPoint(n_parties)); - EXPECT_EQ(ret2, FixedPoint(0)); -} - -TEST(ShareTest, Sort) -{ - constexpr int MIN = 0; - constexpr int MAX = 1; - constexpr int N = 5; - - std::vector x(N); - - std::random_device rd; - std::default_random_engine eng(rd()); - std::uniform_real_distribution distr(MIN, MAX); - - for (int i = 0; i < N; ++i) - { - x[i] = FixedPoint(distr(eng)); - } - auto y = x; - auto start = std::chrono::system_clock::now(); - std::sort(x.begin(), x.end()); - auto end = std::chrono::system_clock::now(); - auto diff = end - start; - auto dsec = std::chrono::duration_cast(diff).count(); - - QMPC_LOG_INFO("share sorting time is : {}", dsec); - auto y_rec = open_and_recons(y); - - start = std::chrono::system_clock::now(); - std::sort(y_rec.begin(), y_rec.end()); - - end = std::chrono::system_clock::now(); - diff = end - start; - dsec = std::chrono::duration_cast(diff).count(); - - QMPC_LOG_INFO("svalue sorting time is : {}", dsec); - - // for (auto &&aa : x) - // { - // QMPC_LOG_INFO("{}",aa.getVal()); - // } - auto x_rec = open_and_recons(x); - for (int i = 0; i < N; ++i) - { - // QMPC_LOG_INFO("X is {}",x_rec[i]); - // QMPC_LOG_INFO("Y is {}", y_rec[i]); - EXPECT_EQ(x_rec[i], y_rec[i]); - } -} - -// streamのテスト -// 1mbを超えるデータの分割送信テスト -TEST(StreamTest, ReconsBulk) -{ - std::vector t(200000); - std::vector expected(200000); - for (int i = 0; i < 200000; i++) - { - t[i] = FixedPoint("1.0"); - expected[i] = FixedPoint("3.0"); - } - auto target = open_and_recons(t); - for (int i = 0; i < static_cast(t.size()); ++i) - { - EXPECT_NEAR(target[i].getDoubleVal(), expected[i].getDoubleVal(), 0.00001); - } -} -TEST(ShareTest, GenericSendShare) -{ - { - const auto clock_start = std::chrono::system_clock::now(); - qmpc::Share::Share a{}; - [[maybe_unused]] auto _ = open_and_recons(a); - const auto clock_end = std::chrono::system_clock::now(); - const auto elapsed_time_ms = - std::chrono::duration_cast(clock_end - clock_start).count(); - QMPC_LOG_INFO("sendshare bool time = {0} ms", elapsed_time_ms); - } - { - const auto clock_start = std::chrono::system_clock::now(); - qmpc::Share::Share b(4); - [[maybe_unused]] auto _ = open_and_recons(b); - const auto clock_end = std::chrono::system_clock::now(); - const auto elapsed_time_ms = - std::chrono::duration_cast(clock_end - clock_start).count(); - QMPC_LOG_INFO("sendshare int time = {0} ms", elapsed_time_ms); - } - { - const auto clock_start = std::chrono::system_clock::now(); - qmpc::Share::Share c(4); - [[maybe_unused]] auto _ = open_and_recons(c); - const auto clock_end = std::chrono::system_clock::now(); - const auto elapsed_time_ms = - std::chrono::duration_cast(clock_end - clock_start).count(); - QMPC_LOG_INFO("sendshare long time = {0} ms", elapsed_time_ms); - } - { - const auto clock_start = std::chrono::system_clock::now(); - qmpc::Share::Share f{}; - [[maybe_unused]] auto _ = open_and_recons(f); - const auto clock_end = std::chrono::system_clock::now(); - const auto elapsed_time_ms = - std::chrono::duration_cast(clock_end - clock_start).count(); - QMPC_LOG_INFO("sendshare fixedPoint time = {0} ms", elapsed_time_ms); - } -} -TEST(ShareTest, addIntShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - qmpc::Share::Share a(3); - qmpc::Share::Share b(4); - a = a + b; // 21 - std::cout << a.getVal() << std::endl; - auto a_rec = open_and_recons(a); - std::cout << "addint share is " << a_rec << std::endl; - EXPECT_EQ(a_rec, n_parties * 3 + n_parties * 4); -} - -TEST(ShareTest, subIntShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - qmpc::Share::Share a(3); - qmpc::Share::Share b(4); - a = a - b; - std::cout << a.getVal() << std::endl; - auto a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, n_parties * 3 - n_parties * 4); -} -TEST(ShareTest, mulIntShare) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - qmpc::Share::Share a(3); - qmpc::Share::Share b(4); - a = a * b; - std::cout << a.getVal() << std::endl; - auto a_rec = open_and_recons(a); - EXPECT_EQ(a_rec, (n_parties * 3) * (n_parties * 4)); -} -TEST(ShareTest, boolLarge) -{ - std::vector> a(50000, true); - auto target = open_and_recons(a); -} -TEST(ShareTest, IntLarge) -{ - std::vector> a(50000, 1); - auto target = open_and_recons(a); -} -TEST(ShareTest, FPLarge) -{ - std::vector> a(50000, FixedPoint("1")); - auto target = open_and_recons(a); -} -TEST(ShareTest, IntMulLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(20000, 1); - std::vector> b(20000, 1); - a = a * b; - auto rec = open_and_recons(a); - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} -TEST(ShareTest, FPMulLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(20000, FixedPoint("1")); - std::vector> b(20000, FixedPoint("1")); - a = a * b; - auto rec = open_and_recons(a); - - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} - -TEST(ShareTest, IntMulExtraLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(100000, 1); - std::vector> b(100000, 1); - a = a * b; - auto rec = open_and_recons(a); - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} - -// 現状乱数範囲(セキュリティ)の都合上64bit浮動小数の積は使用できない -/* -TEST(ShareTest, doubleMulExtraLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(100000, 1.0); - std::vector> b(100000, 1.0); - a = a * b; - auto rec = open_and_recons(a); - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} -TEST(ShareTest, floatMulExtraLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(100000, 1); - std::vector> b(100000, 1); - a = a * b; - auto rec = open_and_recons(a); - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} -*/ - -TEST(ShareTest, FPMulExtraLarge) -{ - Config *conf = Config::getInstance(); - int n_parties = conf->n_parties; - std::vector> a(100000, FixedPoint("1")); - std::vector> b(100000, FixedPoint("1")); - a = a * b; - auto rec = open_and_recons(a); - - EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); -} +// TEST(ShareTest, IncrementShareId) +// { +// Share a(FixedPoint("3.0")); +// Share b(FixedPoint("3.0")); +// int diff = b.getId().getShareId() - a.getId().getShareId(); +// EXPECT_EQ(diff, 1); +// } + +// TEST(ShareTest, GetShareValue) +// { +// Share a(FixedPoint("3.0")); +// EXPECT_EQ(a.getVal(), FixedPoint("3.0")); +// } + +// TEST(ShareTest, AddBetweenShares) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("1.0")); +// Share b(FixedPoint("2.0")); +// a = a + b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(3.0 * n_parties))); +// } + +// TEST(ShareTest, SubBetweenShares) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("2.0")); +// Share b(FixedPoint("1.0")); +// a = a - b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties))); +// } + +// TEST(ShareTest, MulBetweenShares) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("3.0")); +// Share b(FixedPoint("3.0")); +// a = a * b; +// FixedPoint a_rec = open_and_recons(a); +// QMPC_LOG_INFO("a_rec = {}", a_rec.getDoubleVal()); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string((3.0 * n_parties) * (3.0 * n_parties)))); +// } + +// TEST(ShareTest, AddBetweenShareAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("1.0")); +// FixedPoint b("2.0"); +// a = a + b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties + 2.0))); +// } + +// TEST(ShareTest, SubBetweenShareAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("10.0")); +// FixedPoint b("2.0"); +// a = a - b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(10.0 * n_parties - 2.0))); +// } + +// TEST(ShareTest, MulBetweenShareAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("2.0")); +// FixedPoint b("3.0"); +// a = a * b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(2.0 * n_parties * 3.0))); +// } + +// TEST(ShareTest, DivBetweenShareAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("1.0")); +// FixedPoint b("2.0"); +// a = a / b; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(n_parties / 2.0))); +// } + +// // 各要素の加法に関する逆元を一括で求めるテスト +// TEST(ShareTest, GetAdditiveInvVec) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = { +// Share(FixedPoint("5")), +// Share(FixedPoint("3.6")), +// Share(FixedPoint("-6")), +// Share(FixedPoint("-4.2")), +// Share(FixedPoint("0"))}; +// a = getAdditiveInvVec(a); +// std::vector expected = { +// (-5.0 * n_parties), (-3.6 * n_parties), (6.0 * n_parties), (4.2 * n_parties), 0}; +// std::vector ret = open_and_recons(a); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_EQ(expected[i], ret[i].getDoubleVal()); +// } +// } + +// TEST(ShareTest, AddBetweenSharesAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = { +// Share(FixedPoint("5")), +// Share(FixedPoint("3.6")), +// Share(FixedPoint("-6")), +// Share(FixedPoint("-4.2"))}; +// FixedPoint b("2.0"); +// std::vector expected = { +// 5.0 * n_parties + 2.0, +// 3.6 * n_parties + 2.0, +// -6.0 * n_parties + 2.0, +// -4.2 * n_parties + 2.0}; +// std::vector c = a + b; +// std::vector ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } + +// c = b + a; +// ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } +// } + +// TEST(ShareTest, SubBetweenSharesAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = { +// Share(FixedPoint("5")), +// Share(FixedPoint("3.6")), +// Share(FixedPoint("-6")), +// Share(FixedPoint("-4.2"))}; +// FixedPoint b("2.0"); +// std::vector expected = { +// 5.0 * n_parties - 2.0, +// 3.6 * n_parties - 2.0, +// -6.0 * n_parties - 2.0, +// -4.2 * n_parties - 2.0}; +// std::vector c = a - b; +// std::vector ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } + +// c = b - a; +// ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(-expected[i], ret[i].getDoubleVal(), 0.1); +// } +// } + +// TEST(ShareTest, MulBetweenSharesAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = { +// Share(FixedPoint("5")), +// Share(FixedPoint("3.6")), +// Share(FixedPoint("-6")), +// Share(FixedPoint("-4.2"))}; +// FixedPoint b("2.0"); +// std::vector expected = { +// 5.0 * n_parties * 2.0, +// 3.6 * n_parties * 2.0, +// -6.0 * n_parties * 2.0, +// -4.2 * n_parties * 2.0}; +// std::vector c = a * b; +// std::vector ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } + +// c = b * a; +// ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } +// } + +// TEST(ShareTest, DivBetweenSharesAndFixedPoint) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = { +// Share(FixedPoint("5")), +// Share(FixedPoint("3.6")), +// Share(FixedPoint("-6")), +// Share(FixedPoint("-4.2"))}; +// FixedPoint b("2.0"); +// std::vector expected = { +// 5.0 * n_parties / 2.0, +// 3.6 * n_parties / 2.0, +// -6.0 * n_parties / 2.0, +// -4.2 * n_parties / 2.0}; +// std::vector c = a / b; +// std::vector ret = open_and_recons(c); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// EXPECT_NEAR(expected[i], ret[i].getDoubleVal(), 0.1); +// } +// } + +// TEST(ShareTest, AddBetweenFixedPointAndShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("1.0")); +// FixedPoint b("2.0"); +// a = b + a; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(2 + n_parties))); +// } + +// TEST(ShareTest, SubBetweenFixedPointAndShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("2.0")); +// FixedPoint b("10.0"); +// a = b - a; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(10 - (2 * n_parties)))); +// } + +// TEST(ShareTest, MulBetweenFixedPointAndShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("2.0")); +// FixedPoint b("3.0"); +// a = b * a; +// FixedPoint a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, FixedPoint(std::to_string(3 * (2 * n_parties)))); +// } +// TEST(ShareTest, RandBitShare) +// { +// int N = 5; +// for (int i = 0; i < N; ++i) +// { +// Share a = qmpc::Share::getRandBitShare(); +// FixedPoint a_rec = open_and_recons(a); +// QMPC_LOG_INFO("RandBit = {}", a_rec.getDoubleVal()); +// bool left = (-0.01 < a_rec.getDoubleVal()) && (a_rec.getDoubleVal() < 0.01); +// bool right = (0.99 < a_rec.getDoubleVal()) && (a_rec.getDoubleVal() < 1.01); +// EXPECT_TRUE(left || right) << "a_rec = " << a_rec; +// } +// } + +// // 一括RandBitShareのテスト +// TEST(ShareTest, BulkRandBitShare) +// { +// int N = 5; +// std::vector a = qmpc::Share::getRandBitShare(N); +// std::vector a_rec = open_and_recons(a); +// for (int i = 0; i < N; ++i) +// { +// QMPC_LOG_INFO("RandBit = {}", a_rec[i].getDoubleVal()); +// bool left = (-0.01 < a_rec[i].getDoubleVal()) && (a_rec[i].getDoubleVal() < 0.01); +// bool right = (0.99 < a_rec[i].getDoubleVal()) && (a_rec[i].getDoubleVal() < 1.01); +// EXPECT_TRUE(left || right) << "a_rec = " << a_rec[i]; +// } +// } + +// TEST(ShareTest, LSBShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("5")), +// Share(FixedPoint("6")), +// Share(FixedPoint("7.1")), +// Share(FixedPoint("7.4"))}; +// std::vector> expected = { +// {5.0 * n_parties, (double)(5 * n_parties % 2)}, +// {6.0 * n_parties, (double)(6 * n_parties % 2)}, +// {7.1 * n_parties, fmod(round(7.1 * n_parties), 2)}, +// {7.4 * n_parties, fmod(round(7.4 * n_parties), 2)}}; +// double error = 0.0001; +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// Share lsb = qmpc::Share::getLSBShare(s[i]); +// FixedPoint lsb_rec = open_and_recons(lsb); +// QMPC_LOG_INFO("LSB({}) = {}", expected[i][0], lsb_rec.getDoubleVal()); +// EXPECT_NEAR(expected[i][1], lsb_rec.getDoubleVal(), error); +// } +// } + +// // 一括LSBShareのテスト +// TEST(ShareTest, BulkLSBShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("5")), +// Share(FixedPoint("6")), +// Share(FixedPoint("7.1")), +// Share(FixedPoint("7.4"))}; +// std::vector> expected = { +// {5.0 * n_parties, (double)(5 * n_parties % 2)}, +// {6.0 * n_parties, (double)(6 * n_parties % 2)}, +// {7.1 * n_parties, fmod(round(7.1 * n_parties), 2)}, +// {7.4 * n_parties, fmod(round(7.4 * n_parties), 2)}}; +// double error = 0.0001; + +// std::vector lsb = qmpc::Share::getLSBShare(s); +// std::vector lsb_rec = open_and_recons(lsb); +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// QMPC_LOG_INFO("LSB({}) = {}", expected[i][0], lsb_rec[i].getDoubleVal()); +// EXPECT_NEAR(expected[i][1], lsb_rec[i].getDoubleVal(), error); +// } +// } + +// TEST(ShareTest, Floor) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("3.5")), +// Share(FixedPoint("9.26")), +// Share(FixedPoint("4.6666")), +// Share(FixedPoint("4.6667")), +// Share(FixedPoint("3.0")), +// Share(FixedPoint("-3.5")), +// Share(FixedPoint("-9.26")), +// Share(FixedPoint("-4.6666")), +// Share(FixedPoint("-4.6667")), +// Share(FixedPoint("-3.0")), +// }; + +// // [(floor 未適用の値, floor 適用した値)] +// std::vector> expected = { +// {3.5 * n_parties, floor(3.5 * n_parties)}, +// {9.26 * n_parties, floor(9.26 * n_parties)}, +// {4.6666 * n_parties, floor(4.6666 * n_parties)}, +// {4.6667 * n_parties, floor(4.6667 * n_parties)}, +// {3.0 * n_parties, floor(3.0 * n_parties)}, +// {-3.5 * n_parties, floor(-3.5 * n_parties)}, +// {-9.26 * n_parties, floor(-9.26 * n_parties)}, +// {-4.6666 * n_parties, floor(-4.6666 * n_parties)}, +// {-4.6667 * n_parties, floor(-4.6667 * n_parties)}, +// {-3.0 * n_parties, floor(-3.0 * n_parties)}, +// }; +// double error = 0.0001; +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// Share s_floor = qmpc::Share::getFloor(s[i]); +// FixedPoint result = open_and_recons(s_floor); +// QMPC_LOG_INFO("floor({}) = {}", expected[i][0], result); +// EXPECT_NEAR(expected[i][1], result.getDoubleVal(), error); +// } +// } + +// // 一括Floorのテスト +// TEST(ShareTest, BulkFloor) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("3.5")), +// Share(FixedPoint("9.26")), +// Share(FixedPoint("4.6666")), +// Share(FixedPoint("4.6667")), +// Share(FixedPoint("3.0")), +// Share(FixedPoint("-3.5")), +// Share(FixedPoint("-9.26")), +// Share(FixedPoint("-4.6666")), +// Share(FixedPoint("-4.6667")), +// Share(FixedPoint("-3.0")), +// }; + +// // [(floor 未適用の値, floor 適用した値)] +// std::vector> expected = { +// {3.5 * n_parties, floor(3.5 * n_parties)}, +// {9.26 * n_parties, floor(9.26 * n_parties)}, +// {4.6666 * n_parties, floor(4.6666 * n_parties)}, +// {4.6667 * n_parties, floor(4.6667 * n_parties)}, +// {3.0 * n_parties, floor(3.0 * n_parties)}, +// {-3.5 * n_parties, floor(-3.5 * n_parties)}, +// {-9.26 * n_parties, floor(-9.26 * n_parties)}, +// {-4.6666 * n_parties, floor(-4.6666 * n_parties)}, +// {-4.6667 * n_parties, floor(-4.6667 * n_parties)}, +// {-3.0 * n_parties, floor(-3.0 * n_parties)}}; +// double error = 0.0001; + +// std::vector s_floor = qmpc::Share::getFloor(s); +// std::vector result = open_and_recons(s_floor); +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// QMPC_LOG_INFO("floor({}) = {}", expected[i][0], result[i]); +// EXPECT_NEAR(expected[i][1], result[i].getDoubleVal(), error); +// } +// } + +// // LTZ (Less Than Zero) +// TEST(ShareTest, LTZ) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("3.0")), +// Share(FixedPoint("-3.0")), +// Share(FixedPoint("10.5")), +// Share(FixedPoint("-10.5")), +// Share(FixedPoint("10250.4")), +// Share(FixedPoint("-10250.4")), +// Share(FixedPoint("0.0")), +// Share(FixedPoint("0.01")), +// Share(FixedPoint("0.0001")), +// Share(FixedPoint("-0.01")), +// Share(FixedPoint("-0.0001")), +// }; + +// // [(真値, LTZ の結果)] +// std::vector> expected = { +// {3.0 * n_parties, 0}, +// {-3.0 * n_parties, 1}, +// {10.5 * n_parties, 0}, +// {-10.5 * n_parties, 1}, +// {10250.4 * n_parties, 0}, +// {-10250.4 * n_parties, 1}, +// {0.0, 0}, +// {0.01 * n_parties, 0}, +// {0.0001 * n_parties, 0}, +// {-0.01 * n_parties, 1}, +// {-0.0001 * n_parties, 1}, +// }; +// double error = 0.00001; +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// Share s_ltz = qmpc::Share::LTZ(s[i]); +// FixedPoint result = open_and_recons(s_ltz); +// QMPC_LOG_INFO("[{}<0] {}", expected[i][0], result); +// EXPECT_NEAR(result.getDoubleVal(), expected[i][1], error); +// } +// } + +// TEST(ShareTest, LTZBulk) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector s = { +// Share(FixedPoint("3.0")), +// Share(FixedPoint("-3.0")), +// Share(FixedPoint("10.5")), +// Share(FixedPoint("-10.5")), +// Share(FixedPoint("10250.4")), +// Share(FixedPoint("-10250.4")), +// Share(FixedPoint("0.0")), +// Share(FixedPoint("0.01")), +// Share(FixedPoint("0.0001")), +// Share(FixedPoint("-0.01")), +// Share(FixedPoint("-0.0001")), +// }; + +// // [(真値, LTZ の結果)] +// std::vector> expected = { +// {3.0 * n_parties, 0}, +// {-3.0 * n_parties, 1}, +// {10.5 * n_parties, 0}, +// {-10.5 * n_parties, 1}, +// {10250.4 * n_parties, 0}, +// {-10250.4 * n_parties, 1}, +// {0.0, 0}, +// {0.01 * n_parties, 0}, +// {0.0001 * n_parties, 0}, +// {-0.01 * n_parties, 1}, +// {-0.0001 * n_parties, 1}, +// }; +// double error = 0.00001; +// auto s_ltz = qmpc::Share::LTZ(s); +// auto result = open_and_recons(s_ltz); +// for (int i = 0; i < static_cast(s.size()); ++i) +// { +// QMPC_LOG_INFO("[{}<0] {}", expected[i][0], result[i]); +// EXPECT_NEAR(result[i].getDoubleVal(), expected[i][1], error); +// } +// } + +// // Share(とFixedPoint)での比較が可能かテストする +// TEST(ShareTest, ComparisonOperation) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// Share a(FixedPoint("2.0")); +// Share b(FixedPoint("3.0")); +// Share c(FixedPoint("3.0")); +// FixedPoint d(std::to_string(3.0 * n_parties)); + +// EXPECT_TRUE(a < b); +// EXPECT_TRUE(!(a > b)); +// EXPECT_TRUE(a <= b); +// EXPECT_TRUE(!(a >= b)); +// EXPECT_TRUE(a != b); +// EXPECT_TRUE(b == c); +// EXPECT_TRUE(a < d); +// EXPECT_TRUE(!(a > d)); +// EXPECT_TRUE(a <= d); +// EXPECT_TRUE(!(a >= d)); +// EXPECT_TRUE(c == d); +// EXPECT_TRUE(c <= d); +// EXPECT_TRUE(c >= d); +// EXPECT_TRUE(d > a); +// EXPECT_TRUE(!(d < a)); +// EXPECT_TRUE(d >= a); +// EXPECT_TRUE(!(d <= a)); +// EXPECT_TRUE(d != a); +// EXPECT_TRUE(d == c); +// EXPECT_TRUE(d <= c); +// EXPECT_TRUE(d >= c); +// } + +// TEST(ShareTest, ComparisonOperationBulk) +// { +// Share a(FixedPoint("2.0")); +// Share b(FixedPoint("3.0")); +// std::vector l{a, a, b, b}; +// std::vector r{a, b, a, b}; + +// // < +// auto lt = allLess(l, r); +// std::vector lt_t{false, true, false, false}; +// EXPECT_EQ(lt, lt_t); + +// // > +// auto gt = allGreater(l, r); +// std::vector gt_t{false, false, true, false}; +// EXPECT_EQ(gt, gt_t); + +// // <= +// auto lte = allLessEq(l, r); +// std::vector lte_t{true, true, false, true}; +// EXPECT_EQ(lte, lte_t); + +// // >= +// auto gte = allGreaterEq(l, r); +// std::vector gte_t{true, false, true, true}; +// EXPECT_EQ(gte, gte_t); + +// // == +// auto eq = allEq(l, r); +// std::vector eq_t{true, false, false, true}; +// EXPECT_EQ(eq, eq_t); +// } + +// TEST(ShareTest, EqualityEpsilonRandomTest) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; + +// // m,k is LTZ parameters +// int m = 20; +// int k = 48; +// std::vector> random_range{ +// {1, 10}, // small case +// {1LL << (k - 1), (1LL << k) - 20}}; // large case +// for (const auto &[lower, upper] : random_range) +// { +// for (int _ = 0; _ < 10; ++_) +// { +// auto val1 = RandGenerator::getInstance()->getRand(lower, upper); +// auto val2 = val1 + 1; + +// auto val_d1 = static_cast(val1) / (1LL << (m - 3)) / n_parties; +// auto val_d2 = static_cast(val2) / (1LL << (m - 3)) / n_parties; + +// auto s1 = Share(FixedPoint((boost::format("%.10f") % val_d1).str())); +// auto s2 = Share(FixedPoint((boost::format("%.10f") % val_d2).str())); + +// EXPECT_TRUE(s1 == s1); +// EXPECT_FALSE(s1 == s2); +// } +// } +// } + +// // ランダムな値で比較演算のテストを実行 +// TEST(ShareTest, RandomComparisonOperation) +// { +// { +// // Share と Share の比較 +// Share a_share(RandGenerator::getInstance()->getRand(-10000, 10000)); +// Share b_share(RandGenerator::getInstance()->getRand(-10000, 10000)); +// QMPC_LOG_INFO("a_share is {}", a_share.getVal()); +// QMPC_LOG_INFO("b_share is {}", b_share.getVal()); +// FixedPoint a_rec = open_and_recons(a_share); +// FixedPoint b_rec = open_and_recons(b_share); + +// if (a_rec < b_rec) +// { +// EXPECT_LT(a_share, b_share); +// } +// else if (a_rec > b_rec) +// { +// EXPECT_GT(a_share, b_share); +// } +// else +// { +// EXPECT_EQ(a_share, b_share); +// } +// } +// QMPC_LOG_INFO("one step !!"); +// // Share と FixedPoint の比較 +// { +// Share a_share(RandGenerator::getInstance()->getRand(1, 1000)); +// FixedPoint a_rec = open_and_recons(a_share); +// FixedPoint target = FixedPoint("0"); +// QMPC_LOG_INFO("a_rec = \t{}", a_rec.getVal()); +// QMPC_LOG_INFO("target = \t{}", target.getVal()); +// if (a_rec < target) +// { +// EXPECT_LT(a_share, target); +// } +// else if (a_rec > target) +// { +// EXPECT_GT(a_share, target); +// } +// else +// { +// EXPECT_EQ(a_share, target); +// } +// } +// QMPC_LOG_INFO("two step !!"); +// // FixedPoint と Share の比較 +// { +// Share a_share(RandGenerator::getInstance()->getRand(1, 1000)); +// FixedPoint a_rec = open_and_recons(a_share); +// FixedPoint target = FixedPoint("0"); +// QMPC_LOG_INFO("a_rec = \t{}", a_rec.getVal()); +// QMPC_LOG_INFO("target = \t{}", target.getVal()); +// if (target < a_rec) +// { +// EXPECT_LT(target, a_share); +// } +// else if (target > a_rec) +// { +// EXPECT_GT(target, a_share); +// } +// else +// { +// EXPECT_EQ(target, a_share); +// } +// } +// } + +// // 定数値Shareテスト +// TEST(ShareTest, ConstantShare) +// { +// auto fp = FixedPoint("12"); +// auto s = qmpc::Share::getConstantShare(fp); +// auto fp_r = open_and_recons(s); +// EXPECT_EQ(fp, fp_r); +// } + +// // 一括open_and_reconsテスト +// TEST(ShareTest, ReconsBulk) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector t = {FixedPoint("1"), FixedPoint("2"), FixedPoint("3")}; +// std::vector expected = { +// FixedPoint(std::to_string(n_parties)), +// FixedPoint(std::to_string(2.0 * n_parties)), +// FixedPoint(std::to_string(3.0 * n_parties))}; +// auto target = open_and_recons(t); +// bool ng = false; + +// for (int i = 0; i < static_cast(t.size()); ++i) +// { +// if (expected[i] - target[i] <= FixedPoint("-0.00001") +// or expected[i] - target[i] >= FixedPoint("0.00001")) +// { +// ng = true; +// } +// } + +// EXPECT_TRUE(not ng); +// } + +// // 一括加算のテスト +// TEST(ShareTest, AddBulk) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; +// std::vector b = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; +// std::vector expected = { +// FixedPoint(std::to_string(2.0 * n_parties)), +// FixedPoint(std::to_string(4.0 * n_parties)), +// FixedPoint(std::to_string(6.0 * n_parties))}; +// auto ret = a + b; +// auto target = open_and_recons(ret); + +// QMPC_LOG_INFO("AddBulk End !!"); +// EXPECT_EQ(target, expected); +// } + +// // 一括減算のテスト +// TEST(ShareTest, SubBulk) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = {FixedPoint("3.0"), FixedPoint("2.0"), FixedPoint("9.0")}; +// std::vector b = {FixedPoint("1.0"), FixedPoint("6.0"), FixedPoint("3.0")}; +// std::vector expected = { +// FixedPoint(std::to_string(2.0 * n_parties)), +// FixedPoint(std::to_string(-4.0 * n_parties)), +// FixedPoint(std::to_string(6.0 * n_parties))}; +// auto ret = a - b; +// auto target = open_and_recons(ret); + +// QMPC_LOG_INFO("SubBulk End !!"); +// EXPECT_EQ(target, expected); +// } + +// // 一括乗算のテスト +// TEST(ShareTest, MulBulk) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector a = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; +// std::vector b = {FixedPoint("1.0"), FixedPoint("2.0"), FixedPoint("3.0")}; +// std::vector expected = { +// FixedPoint(std::to_string(n_parties * n_parties)), +// FixedPoint(std::to_string((2.0 * n_parties) * (2.0 * n_parties))), +// FixedPoint(std::to_string((3.0 * n_parties) * (3.0 * n_parties)))}; +// auto ret = a * b; +// auto target = open_and_recons(ret); +// bool ng = false; + +// QMPC_LOG_INFO("MulBulk End !!"); +// for (int i = 0; i < static_cast(a.size()); ++i) +// { +// QMPC_LOG_INFO(target[i].getStrVal()); +// if (expected[i] - target[i] <= FixedPoint("-0.00001") +// or expected[i] - target[i] >= FixedPoint("0.00001")) +// { +// ng = true; +// } +// } + +// EXPECT_TRUE(not ng); +// } + +// // Share_Id 同時実行 +// TEST(ShareTest, SameShareId) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// FixedPoint ret1, ret2; +// std::thread th1( +// [&]() +// { +// qmpc::Share::AddressId::setJobId(0); +// Share a(1); +// ret1 = open_and_recons(a); +// QMPC_LOG_INFO("Firset thread is {}", ret1.getVal()); +// QMPC_LOG_INFO("First ID is {}", a.getId()); +// } +// ); +// std::thread th2( +// [&]() +// { +// qmpc::Share::AddressId::setJobId(1); +// Share a(0); +// ret2 = open_and_recons(a); +// QMPC_LOG_INFO("Second thread is {}", ret2.getVal()); +// QMPC_LOG_INFO("Second ID is {}", a.getId()); +// } +// ); +// th1.join(); +// th2.join(); + +// EXPECT_EQ(ret1, FixedPoint(n_parties)); +// EXPECT_EQ(ret2, FixedPoint(0)); +// } + +// TEST(ShareTest, Sort) +// { +// constexpr int MIN = 0; +// constexpr int MAX = 1; +// constexpr int N = 5; + +// std::vector x(N); + +// std::random_device rd; +// std::default_random_engine eng(rd()); +// std::uniform_real_distribution distr(MIN, MAX); + +// for (int i = 0; i < N; ++i) +// { +// x[i] = FixedPoint(distr(eng)); +// } +// auto y = x; +// auto start = std::chrono::system_clock::now(); +// std::sort(x.begin(), x.end()); +// auto end = std::chrono::system_clock::now(); +// auto diff = end - start; +// auto dsec = std::chrono::duration_cast(diff).count(); + +// QMPC_LOG_INFO("share sorting time is : {}", dsec); +// auto y_rec = open_and_recons(y); + +// start = std::chrono::system_clock::now(); +// std::sort(y_rec.begin(), y_rec.end()); + +// end = std::chrono::system_clock::now(); +// diff = end - start; +// dsec = std::chrono::duration_cast(diff).count(); + +// QMPC_LOG_INFO("svalue sorting time is : {}", dsec); + +// // for (auto &&aa : x) +// // { +// // QMPC_LOG_INFO("{}",aa.getVal()); +// // } +// auto x_rec = open_and_recons(x); +// for (int i = 0; i < N; ++i) +// { +// // QMPC_LOG_INFO("X is {}",x_rec[i]); +// // QMPC_LOG_INFO("Y is {}", y_rec[i]); +// EXPECT_EQ(x_rec[i], y_rec[i]); +// } +// } + +// // streamのテスト +// // 1mbを超えるデータの分割送信テスト +// TEST(StreamTest, ReconsBulk) +// { +// std::vector t(200000); +// std::vector expected(200000); +// for (int i = 0; i < 200000; i++) +// { +// t[i] = FixedPoint("1.0"); +// expected[i] = FixedPoint("3.0"); +// } +// auto target = open_and_recons(t); +// for (int i = 0; i < static_cast(t.size()); ++i) +// { +// EXPECT_NEAR(target[i].getDoubleVal(), expected[i].getDoubleVal(), 0.00001); +// } +// } +// TEST(ShareTest, GenericSendShare) +// { +// { +// const auto clock_start = std::chrono::system_clock::now(); +// qmpc::Share::Share a{}; +// [[maybe_unused]] auto _ = open_and_recons(a); +// const auto clock_end = std::chrono::system_clock::now(); +// const auto elapsed_time_ms = +// std::chrono::duration_cast(clock_end - clock_start).count(); +// QMPC_LOG_INFO("sendshare bool time = {0} ms", elapsed_time_ms); +// } +// { +// const auto clock_start = std::chrono::system_clock::now(); +// qmpc::Share::Share b(4); +// [[maybe_unused]] auto _ = open_and_recons(b); +// const auto clock_end = std::chrono::system_clock::now(); +// const auto elapsed_time_ms = +// std::chrono::duration_cast(clock_end - clock_start).count(); +// QMPC_LOG_INFO("sendshare int time = {0} ms", elapsed_time_ms); +// } +// { +// const auto clock_start = std::chrono::system_clock::now(); +// qmpc::Share::Share c(4); +// [[maybe_unused]] auto _ = open_and_recons(c); +// const auto clock_end = std::chrono::system_clock::now(); +// const auto elapsed_time_ms = +// std::chrono::duration_cast(clock_end - clock_start).count(); +// QMPC_LOG_INFO("sendshare long time = {0} ms", elapsed_time_ms); +// } +// { +// const auto clock_start = std::chrono::system_clock::now(); +// qmpc::Share::Share f{}; +// [[maybe_unused]] auto _ = open_and_recons(f); +// const auto clock_end = std::chrono::system_clock::now(); +// const auto elapsed_time_ms = +// std::chrono::duration_cast(clock_end - clock_start).count(); +// QMPC_LOG_INFO("sendshare fixedPoint time = {0} ms", elapsed_time_ms); +// } +// } +// TEST(ShareTest, addIntShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// qmpc::Share::Share a(3); +// qmpc::Share::Share b(4); +// a = a + b; // 21 +// std::cout << a.getVal() << std::endl; +// auto a_rec = open_and_recons(a); +// std::cout << "addint share is " << a_rec << std::endl; +// EXPECT_EQ(a_rec, n_parties * 3 + n_parties * 4); +// } + +// TEST(ShareTest, subIntShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// qmpc::Share::Share a(3); +// qmpc::Share::Share b(4); +// a = a - b; +// std::cout << a.getVal() << std::endl; +// auto a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, n_parties * 3 - n_parties * 4); +// } +// TEST(ShareTest, mulIntShare) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// qmpc::Share::Share a(3); +// qmpc::Share::Share b(4); +// a = a * b; +// std::cout << a.getVal() << std::endl; +// auto a_rec = open_and_recons(a); +// EXPECT_EQ(a_rec, (n_parties * 3) * (n_parties * 4)); +// } +// TEST(ShareTest, boolLarge) +// { +// std::vector> a(50000, true); +// auto target = open_and_recons(a); +// } +// TEST(ShareTest, IntLarge) +// { +// std::vector> a(50000, 1); +// auto target = open_and_recons(a); +// } +// TEST(ShareTest, FPLarge) +// { +// std::vector> a(50000, FixedPoint("1")); +// auto target = open_and_recons(a); +// } +// TEST(ShareTest, IntMulLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(20000, 1); +// std::vector> b(20000, 1); +// a = a * b; +// auto rec = open_and_recons(a); +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } +// TEST(ShareTest, FPMulLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(20000, FixedPoint("1")); +// std::vector> b(20000, FixedPoint("1")); +// a = a * b; +// auto rec = open_and_recons(a); + +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } + +// TEST(ShareTest, IntMulExtraLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(100000, 1); +// std::vector> b(100000, 1); +// a = a * b; +// auto rec = open_and_recons(a); +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } + +// // 現状乱数範囲(セキュリティ)の都合上64bit浮動小数の積は使用できない +// /* +// TEST(ShareTest, doubleMulExtraLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(100000, 1.0); +// std::vector> b(100000, 1.0); +// a = a * b; +// auto rec = open_and_recons(a); +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } +// TEST(ShareTest, floatMulExtraLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(100000, 1); +// std::vector> b(100000, 1); +// a = a * b; +// auto rec = open_and_recons(a); +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } +// */ + +// TEST(ShareTest, FPMulExtraLarge) +// { +// Config *conf = Config::getInstance(); +// int n_parties = conf->n_parties; +// std::vector> a(100000, FixedPoint("1")); +// std::vector> b(100000, FixedPoint("1")); +// a = a * b; +// auto rec = open_and_recons(a); + +// EXPECT_EQ(rec[0], (n_parties * 1) * (n_parties * 1)); +// } diff --git a/packages/server/computation_container/test/unit_test/BUILD b/packages/server/computation_container/test/unit_test/BUILD index d41a7221f..1d8760b2c 100644 --- a/packages/server/computation_container/test/unit_test/BUILD +++ b/packages/server/computation_container/test/unit_test/BUILD @@ -58,7 +58,8 @@ cc_test( "//config_parse:config_parse", "@proto//computation_to_computation_container:computation_to_computation_cc_grpc", "//share:address", - "//logging:log" + "//logging:log", + "//fixed_point:fixed_point" ], linkopts = ["-pthread"], ) diff --git a/packages/server/computation_container/test/unit_test/ctoc_test.cpp b/packages/server/computation_container/test/unit_test/ctoc_test.cpp index cc0272e7b..81960798b 100644 --- a/packages/server/computation_container/test/unit_test/ctoc_test.cpp +++ b/packages/server/computation_container/test/unit_test/ctoc_test.cpp @@ -15,6 +15,7 @@ #include "logging/logger.hpp" #include "server/computation_to_computation_container/server.hpp" #include "share/address_id.hpp" +#include "fixed_point/fixed_point.hpp" void runServer(std::string endpoint) { @@ -41,13 +42,13 @@ TEST(CtoC_Test, EXCHANGESHARE) std::vector share_id(1); computationtocomputation::Shares share; std::cout << "exchangeshare id " << share_id[0] << std::endl; - std::string value = "10"; auto a = share.mutable_address_id(); a->set_share_id(share_id[0].getShareId()); a->set_job_id(share_id[0].getJobId()); a->set_party_id(conf->party_id); - computationtocomputation::Shares_Share *multiple_shares = share.add_share_list(); - multiple_shares->set_byte(value); + auto *multiple_shares = share.add_share_list(); + FixedPoint value("10"); + value.setShare(multiple_shares); auto stub_ = createStub( Url::Parse("http://localhost:50120") @@ -71,7 +72,7 @@ TEST(CtoC_Test, EXCHANGESHARES) Config *conf = Config::getInstance(); unsigned int length = 2; std::vector share_ids(length); - std::vector values = {"10", "11"}; + std::vector values = {"10", "11"}; computationtocomputation::Shares shares; auto a = shares.mutable_address_id(); a->set_share_id(share_ids[0].getShareId()); @@ -80,7 +81,7 @@ TEST(CtoC_Test, EXCHANGESHARES) for (unsigned int i = 0; i < length; i++) { computationtocomputation::Shares_Share *multiple_shares = shares.add_share_list(); - multiple_shares->set_byte(values[i]); + value[i].setShare(multiple_shares); } auto stub_ = createStub( Url::Parse("http://localhost:50120") diff --git a/proto/computation_to_computation_container/computation_to_computation.proto b/proto/computation_to_computation_container/computation_to_computation.proto index 5179a1ec3..fa87750d6 100644 --- a/proto/computation_to_computation_container/computation_to_computation.proto +++ b/proto/computation_to_computation_container/computation_to_computation.proto @@ -24,17 +24,23 @@ message Address{ int32 party_id = 4; // the id of party(0, 1, 2) } +message BigIntByte{ + bool sgn = 1; + bytes byte = 2; +} + +message Share{ + oneof value{ + int64 num = 1; + BigIntByte fp = 2; + bool flag = 3; + } +} + /** * the message of shares */ message Shares { - message Share{ - oneof value{ - int64 num = 1; - bytes byte = 2; - bool flag = 3; - } - } repeated Share share_list = 1; Address address_id = 2; } \ No newline at end of file diff --git a/proto/engine_to_bts/engine_to_bts.pb.go b/proto/engine_to_bts/engine_to_bts.pb.go index b219abe00..e58d7753f 100644 --- a/proto/engine_to_bts/engine_to_bts.pb.go +++ b/proto/engine_to_bts/engine_to_bts.pb.go @@ -83,20 +83,75 @@ func (x *GetRequest) GetRequestId() int64 { return 0 } +type BigIntByte struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Sgn bool `protobuf:"varint,1,opt,name=sgn,proto3" json:"sgn,omitempty"` + Byte []byte `protobuf:"bytes,2,opt,name=byte,proto3" json:"byte,omitempty"` +} + +func (x *BigIntByte) Reset() { + *x = BigIntByte{} + if protoimpl.UnsafeEnabled { + mi := &file_engine_to_bts_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *BigIntByte) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BigIntByte) ProtoMessage() {} + +func (x *BigIntByte) ProtoReflect() protoreflect.Message { + mi := &file_engine_to_bts_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BigIntByte.ProtoReflect.Descriptor instead. +func (*BigIntByte) Descriptor() ([]byte, []int) { + return file_engine_to_bts_proto_rawDescGZIP(), []int{1} +} + +func (x *BigIntByte) GetSgn() bool { + if x != nil { + return x.Sgn + } + return false +} + +func (x *BigIntByte) GetByte() []byte { + if x != nil { + return x.Byte + } + return nil +} + type Triple struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - A int64 `protobuf:"varint,2,opt,name=a,proto3" json:"a,omitempty"` - B int64 `protobuf:"varint,3,opt,name=b,proto3" json:"b,omitempty"` - C int64 `protobuf:"varint,4,opt,name=c,proto3" json:"c,omitempty"` + A *BigIntByte `protobuf:"bytes,2,opt,name=a,proto3" json:"a,omitempty"` + B *BigIntByte `protobuf:"bytes,3,opt,name=b,proto3" json:"b,omitempty"` + C *BigIntByte `protobuf:"bytes,4,opt,name=c,proto3" json:"c,omitempty"` } func (x *Triple) Reset() { *x = Triple{} if protoimpl.UnsafeEnabled { - mi := &file_engine_to_bts_proto_msgTypes[1] + mi := &file_engine_to_bts_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -109,7 +164,7 @@ func (x *Triple) String() string { func (*Triple) ProtoMessage() {} func (x *Triple) ProtoReflect() protoreflect.Message { - mi := &file_engine_to_bts_proto_msgTypes[1] + mi := &file_engine_to_bts_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -122,28 +177,28 @@ func (x *Triple) ProtoReflect() protoreflect.Message { // Deprecated: Use Triple.ProtoReflect.Descriptor instead. func (*Triple) Descriptor() ([]byte, []int) { - return file_engine_to_bts_proto_rawDescGZIP(), []int{1} + return file_engine_to_bts_proto_rawDescGZIP(), []int{2} } -func (x *Triple) GetA() int64 { +func (x *Triple) GetA() *BigIntByte { if x != nil { return x.A } - return 0 + return nil } -func (x *Triple) GetB() int64 { +func (x *Triple) GetB() *BigIntByte { if x != nil { return x.B } - return 0 + return nil } -func (x *Triple) GetC() int64 { +func (x *Triple) GetC() *BigIntByte { if x != nil { return x.C } - return 0 + return nil } type GetTriplesResponse struct { @@ -157,7 +212,7 @@ type GetTriplesResponse struct { func (x *GetTriplesResponse) Reset() { *x = GetTriplesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_engine_to_bts_proto_msgTypes[2] + mi := &file_engine_to_bts_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -170,7 +225,7 @@ func (x *GetTriplesResponse) String() string { func (*GetTriplesResponse) ProtoMessage() {} func (x *GetTriplesResponse) ProtoReflect() protoreflect.Message { - mi := &file_engine_to_bts_proto_msgTypes[2] + mi := &file_engine_to_bts_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -183,7 +238,7 @@ func (x *GetTriplesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetTriplesResponse.ProtoReflect.Descriptor instead. func (*GetTriplesResponse) Descriptor() ([]byte, []int) { - return file_engine_to_bts_proto_rawDescGZIP(), []int{2} + return file_engine_to_bts_proto_rawDescGZIP(), []int{3} } func (x *GetTriplesResponse) GetTriples() []*Triple { @@ -204,7 +259,7 @@ type GetRandBitsResponse struct { func (x *GetRandBitsResponse) Reset() { *x = GetRandBitsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_engine_to_bts_proto_msgTypes[3] + mi := &file_engine_to_bts_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -217,7 +272,7 @@ func (x *GetRandBitsResponse) String() string { func (*GetRandBitsResponse) ProtoMessage() {} func (x *GetRandBitsResponse) ProtoReflect() protoreflect.Message { - mi := &file_engine_to_bts_proto_msgTypes[3] + mi := &file_engine_to_bts_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -230,7 +285,7 @@ func (x *GetRandBitsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRandBitsResponse.ProtoReflect.Descriptor instead. func (*GetRandBitsResponse) Descriptor() ([]byte, []int) { - return file_engine_to_bts_proto_rawDescGZIP(), []int{3} + return file_engine_to_bts_proto_rawDescGZIP(), []int{4} } func (x *GetRandBitsResponse) GetRandbits() []int64 { @@ -251,32 +306,40 @@ var file_engine_to_bts_proto_rawDesc = []byte{ 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x32, - 0x0a, 0x06, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x01, 0x61, 0x12, 0x0c, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x01, 0x62, 0x12, 0x0c, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x01, 0x63, 0x22, 0x43, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x70, - 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x65, 0x6e, 0x67, 0x69, - 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x52, 0x07, - 0x74, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x52, 0x61, - 0x6e, 0x64, 0x42, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x64, 0x62, 0x69, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, - 0x52, 0x08, 0x72, 0x61, 0x6e, 0x64, 0x62, 0x69, 0x74, 0x73, 0x32, 0xa3, 0x01, 0x0a, 0x0b, 0x45, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x54, 0x6f, 0x42, 0x74, 0x73, 0x12, 0x48, 0x0a, 0x0a, 0x47, 0x65, - 0x74, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, - 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, - 0x47, 0x65, 0x74, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x42, - 0x69, 0x74, 0x73, 0x12, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, - 0x73, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x65, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x61, - 0x6e, 0x64, 0x42, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, - 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x2d, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x2f, - 0x51, 0x75, 0x69, 0x63, 0x6b, 0x4d, 0x50, 0x43, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x62, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x0a, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x42, 0x79, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x73, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x67, 0x6e, 0x12, 0x12, + 0x0a, 0x04, 0x62, 0x79, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x79, + 0x74, 0x65, 0x22, 0x7d, 0x0a, 0x06, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x01, + 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, + 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x42, 0x79, 0x74, 0x65, + 0x52, 0x01, 0x61, 0x12, 0x25, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x42, 0x69, 0x67, + 0x49, 0x6e, 0x74, 0x42, 0x79, 0x74, 0x65, 0x52, 0x01, 0x62, 0x12, 0x25, 0x0a, 0x01, 0x63, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, + 0x62, 0x74, 0x73, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x42, 0x79, 0x74, 0x65, 0x52, 0x01, + 0x63, 0x22, 0x43, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x70, 0x6c, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, + 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x52, 0x07, 0x74, + 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, + 0x64, 0x42, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x72, 0x61, 0x6e, 0x64, 0x62, 0x69, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, + 0x08, 0x72, 0x61, 0x6e, 0x64, 0x62, 0x69, 0x74, 0x73, 0x32, 0xa3, 0x01, 0x0a, 0x0b, 0x45, 0x6e, + 0x67, 0x69, 0x6e, 0x65, 0x54, 0x6f, 0x42, 0x74, 0x73, 0x12, 0x48, 0x0a, 0x0a, 0x47, 0x65, 0x74, + 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, + 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x47, + 0x65, 0x74, 0x54, 0x72, 0x69, 0x70, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x42, 0x69, + 0x74, 0x73, 0x12, 0x17, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, + 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x65, 0x6e, + 0x67, 0x69, 0x6e, 0x65, 0x74, 0x6f, 0x62, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, + 0x64, 0x42, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, + 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x63, + 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x2d, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x2f, 0x51, + 0x75, 0x69, 0x63, 0x6b, 0x4d, 0x50, 0x43, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, + 0x67, 0x69, 0x6e, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x62, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -291,24 +354,28 @@ func file_engine_to_bts_proto_rawDescGZIP() []byte { return file_engine_to_bts_proto_rawDescData } -var file_engine_to_bts_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_engine_to_bts_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_engine_to_bts_proto_goTypes = []interface{}{ (*GetRequest)(nil), // 0: enginetobts.GetRequest - (*Triple)(nil), // 1: enginetobts.Triple - (*GetTriplesResponse)(nil), // 2: enginetobts.GetTriplesResponse - (*GetRandBitsResponse)(nil), // 3: enginetobts.GetRandBitsResponse + (*BigIntByte)(nil), // 1: enginetobts.BigIntByte + (*Triple)(nil), // 2: enginetobts.Triple + (*GetTriplesResponse)(nil), // 3: enginetobts.GetTriplesResponse + (*GetRandBitsResponse)(nil), // 4: enginetobts.GetRandBitsResponse } var file_engine_to_bts_proto_depIdxs = []int32{ - 1, // 0: enginetobts.GetTriplesResponse.triples:type_name -> enginetobts.Triple - 0, // 1: enginetobts.EngineToBts.GetTriples:input_type -> enginetobts.GetRequest - 0, // 2: enginetobts.EngineToBts.GetRandBits:input_type -> enginetobts.GetRequest - 2, // 3: enginetobts.EngineToBts.GetTriples:output_type -> enginetobts.GetTriplesResponse - 3, // 4: enginetobts.EngineToBts.GetRandBits:output_type -> enginetobts.GetRandBitsResponse - 3, // [3:5] is the sub-list for method output_type - 1, // [1:3] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 1, // 0: enginetobts.Triple.a:type_name -> enginetobts.BigIntByte + 1, // 1: enginetobts.Triple.b:type_name -> enginetobts.BigIntByte + 1, // 2: enginetobts.Triple.c:type_name -> enginetobts.BigIntByte + 2, // 3: enginetobts.GetTriplesResponse.triples:type_name -> enginetobts.Triple + 0, // 4: enginetobts.EngineToBts.GetTriples:input_type -> enginetobts.GetRequest + 0, // 5: enginetobts.EngineToBts.GetRandBits:input_type -> enginetobts.GetRequest + 3, // 6: enginetobts.EngineToBts.GetTriples:output_type -> enginetobts.GetTriplesResponse + 4, // 7: enginetobts.EngineToBts.GetRandBits:output_type -> enginetobts.GetRandBitsResponse + 6, // [6:8] is the sub-list for method output_type + 4, // [4:6] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_engine_to_bts_proto_init() } @@ -330,7 +397,7 @@ func file_engine_to_bts_proto_init() { } } file_engine_to_bts_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Triple); i { + switch v := v.(*BigIntByte); i { case 0: return &v.state case 1: @@ -342,7 +409,7 @@ func file_engine_to_bts_proto_init() { } } file_engine_to_bts_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetTriplesResponse); i { + switch v := v.(*Triple); i { case 0: return &v.state case 1: @@ -354,6 +421,18 @@ func file_engine_to_bts_proto_init() { } } file_engine_to_bts_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetTriplesResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_engine_to_bts_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetRandBitsResponse); i { case 0: return &v.state @@ -372,7 +451,7 @@ func file_engine_to_bts_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_engine_to_bts_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 5, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/engine_to_bts/engine_to_bts.proto b/proto/engine_to_bts/engine_to_bts.proto index 3b7309daa..8e8d51f78 100644 --- a/proto/engine_to_bts/engine_to_bts.proto +++ b/proto/engine_to_bts/engine_to_bts.proto @@ -15,10 +15,15 @@ message GetRequest{ int64 request_id = 3; } +message BigIntByte{ + bool sgn = 1; + bytes byte = 2; +} + message Triple{ - int64 a = 2; - int64 b = 3; - int64 c = 4; + BigIntByte a = 2; + BigIntByte b = 3; + BigIntByte c = 4; } message GetTriplesResponse{