614 Commits (dev)

Author	SHA1	Message	Date
Stephen Shelton	8adb6295fc	Initialize sqlite_orm and start interacting with it	4 years ago
Stephen Shelton	73c9ddff52	Begin peer stats infrastructure	4 years ago
Jason Rhinelander	a7c42ab2bd	Use lokimq's hex/base32z encoding/decoding	4 years ago
Jason Rhinelander	271ded7a1f	Fix test variable scope ... These variables need to persist past the end of the lambda and weren't; release builds didn't seem to mind access the freed memory, but Debug builds triggered failures.	4 years ago
Jeff Becker	8fc52fcbbe	increase test timeout	4 years ago
Jeff Becker	c9a2222d39	Revert "bump submodules" ... This reverts commit 0de2b994fa3e3252eae46d39960dd17872184050.	4 years ago
Jeff Becker	0f21eeccb0	* rework exit codepath to allow multiple exits ... * rework net code for ip ranges to be cleaner * clean up endpoint auth code * refactor config to validate network configs before setting up endpoints * remove buildone from path/pathbuilder.cpp so we don't spam connection attempts	4 years ago
Jeff Becker	2ef2e6171a	bump submodules	4 years ago
Jeff Becker	3cdca30a74	more auth shit	4 years ago
Jeff Becker	0d6e3bcd89	fix crashing tests	4 years ago
Jeff Becker	0787b6e2fd	load config differently for unit tests because they run as root in CI for some reason	4 years ago
Jeff Becker	98a3b45f16	disable logging to see why ci tests die like a sucka	4 years ago
Jeff Becker	b6a7b5ccfb	only run catch2 tests in gdb and add assert to unit test	4 years ago
Jeff Becker	e13e886df9	fix up event loop crap so that unit tests pass	4 years ago
Jeff Becker	456f9d4ba1	remove GNU-ism	4 years ago
Jeff Becker	0a889d7042	fix up iwp unit test	4 years ago
Jeff Becker	e95b9d530e	fix unit tests, make them pass	4 years ago
Jeff Becker	f4971a88fd	use lokimq workers instead of llarp:🧵:ThreadPool	4 years ago
Stephen Shelton	11951510bf	Remove libabyss and rpc::Caller/rpc::Server	4 years ago
Stephen Shelton	0aa43c6b07	Pass RuntimeOptions instead of 'bool isRelay'	4 years ago
Stephen Shelton	b5d6a73ffd	Rip out most of C API	4 years ago
Jeff Becker	6984cda3a6	add pybind and router hive to ci	4 years ago
Jeff Becker	b8e1ffa83e	add comments and improve the regression test	4 years ago
Jeff Becker	3d2990f90d	use llarp::LogSilencer to shut up loging in unit tests	4 years ago
Jeff Becker	a73335579a	silence logging in regression test	4 years ago
Jeff Becker	800668348a	add regression test for key backup bug	4 years ago
Stephen Shelton	1497b829bd	Ignore our self.signed file if we're a client	4 years ago
Jeff Becker	328c7a398e	make sure event loop owns logic so that logic call does not use seperate thread	4 years ago
Jeff Becker	00143e63f4	put replay filters on transit hops to reduce retransmissions.	4 years ago
Jason Rhinelander	d05e6716cb	Remove llarp::str(string_view) ... It was a workaround for pre-C++17 std::string which didn't support passing a string_view to various functions/operators. There's only one place left that needs an explicit conversion, and that's where it is used as a map key; so just be explicit there and remove llarp::str() everywhere else.	4 years ago
Jason Rhinelander	ebd2142114	Don't use std::optional::value() because f u macos ... This replaces all use of std::optional's `opt.value()` with `*opt` because macOS is great and the ghost of Steve Jobs says that actually supporting std::optional's value() method is not for chumps before macOS 10.14. So don't use it because Apple is great. Pretty much all of our use of it actually is done better with operator* anyway (since operator* doesn't do a check that the optional has a value). Also replaced *most* of the `has_value()` calls with direct bool context, except for one in the config section which looked really confusing at a glance without a has_value().	4 years ago
Jason Rhinelander	bdc9c7bfa8	Move IPRange out of net.hpp; free up TruncateV6 etc. ... - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)	4 years ago
Stephen Shelton	807bfc5302	Initialize Config with LoadConfig in all key manager tests	4 years ago
Stephen Shelton	fa6845b206	Use global RC file paths instead of redefining them	4 years ago
Stephen Shelton	ac225eb65e	Testing: explicitly initialize variable	4 years ago
Stephen Shelton	7167b4ad02	Properly initialize config in unit test	4 years ago
Rick V	918a09c0cf	fix sockaddr win32 and collapse headers on the unix side	4 years ago
Jason Rhinelander	c5faa86926	cmake refactor ... Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).	4 years ago
Jason Rhinelander	26ecf23ad8	Silence various warnings	4 years ago
Jason Rhinelander	bc4573c447	Disable empty string SockAddr throw test ... The code intentionally no longer throws and handles this as a special case (resulting in an empty SockAddr).	4 years ago
Jeff Becker	1780e86faa	fix up unit tests, make them all pass	4 years ago
Jeff	a5b09c47e1	Merge pull request #1262 from notlesh/bandaids-for-sockaddr-refactor-2020-05-11 ... Bandaids for sockaddr refactor 2020 05 11	4 years ago
Stephen Shelton	174c9ec740	log--	4 years ago
Stephen Shelton	78d09f2ae5	Support SockAddr in from sockaddr and friends	4 years ago
Stephen Shelton	e944bcb28a	Unit tests and fixes for SockAddr::fromString()	4 years ago
Stephen Shelton	0b54087689	Begin implementing SockAddr	4 years ago
Stephen Shelton	bcf473757d	Fix broken config-related test cases	4 years ago
Jeff Becker	635dc4fe13	unbreak router hive ... llarp/config/config.cpp: respect [network]:type option llarp/handlers/exit.cpp: when [network]:type is null dont init tun interface llarp/service/context.cpp: respect [network]:type option change endpoint name back to "default" llarp/tooling/router_hive.cpp: dont use LogicCall for obtaining RCs from underlying relays, it crashes the mainloop and it's probably safe to readonly access RCs. pybind/common.hpp: remove typecasters as we use C++17 now pybind/llarp/config.cpp: remove SnappConfig wire up NetworkConfig pybind/llarp/handlers/pyhandler.hpp: remove SnappConfig from constructor pybind/llarp/handlers/pyhandler.cpp: update constructor implementation to match header test/hive/hive.py: remove broke endpoint related code wire up null endpoint option using NetworkConfig use index at 0 for relays and clients instead of 1 dont add a python endpoint to all clients	4 years ago
Stephen Shelton	42a7bcd434	Less invasive fix for Addr	4 years ago
Stephen Shelton	d3b248e004	Add test for broken Addr::from_char_array()	4 years ago
Stephen Shelton	779658edd0	Refactor ExitEndpoint's config, mv dns ops from [network] to [dns]	4 years ago
Stephen Shelton	21ad442b55	Remove NetConfig_t	4 years ago
Jason Rhinelander	1697bf90fe	C++17 ... Compiles with C++17, replaces ghc::filesystem with std::filesystem, nonstd::optional with std::optional, and llarp::string_view with std::string_view.	4 years ago
Stephen Shelton	5c6c7c7020	Expand on ConfigDefinition truthy/falsy unit test	4 years ago
Stephen Shelton	320564d792	Specialize ConfigOption for bool to accept "truthy" / "falsy" values	4 years ago
Stephen Shelton	936fbb2424	Fix config not falling back to undeclared handler for missing option	4 years ago
Stephen Shelton	526b1320b7	Some maybe-fixes for RouterHive post config cleanup	4 years ago
Stephen Shelton	dfcf8fb62e	Update RouterHive to reflect config changes	4 years ago
Stephen Shelton	0a9515a94a	Proper support for multiple values @ ConfigDefinition	4 years ago
Stephen Shelton	a6787657be	Refactor config comments to take list of strings	4 years ago
Stephen Shelton	a8671cf9c7	Rename config classes for clarity ... ConfigDefinition -> OptionDefiniton Configuration -> ConfigDefinition	4 years ago
Stephen Shelton	9e850705b4	Add 'AssignmentAcceptor' convenience for simple config acceptors	4 years ago
Stephen Shelton	733efbab40	Reflect removal of accessors on config structs	4 years ago
Stephen Shelton	028e55e997	Remove pre-refactor config test	4 years ago
Stephen Shelton	14e7789847	Add padding to config file generated output	4 years ago
Stephen Shelton	18ee23c2a3	Support for comments in config definition	4 years ago
Stephen Shelton	c5ff672c79	Use 'undeclared handler' for multi-valued 'add-node' config option	4 years ago
Stephen Shelton	9a1b7b20de	Add "undeclared value" handler to Configuration	4 years ago
Stephen Shelton	e9708a5d1c	Add split(string_view, char) util function	4 years ago
Stephen Shelton	ffc58fcedb	Remove dead code (serverOptions)	4 years ago
Stephen Shelton	2e47262350	Demystify LinksConfig	4 years ago
Stephen Shelton	a44eb73baa	Add config INI output unit tests	4 years ago
Stephen Shelton	69331f1571	Remove multiValued as an argument to ConfigDefinition	4 years ago
Stephen Shelton	f6d000838f	Clarity and convenience for defining config options	4 years ago
Stephen Shelton	02e31f3867	Introduce acceptor function in ConfigDefinition	4 years ago
Stephen Shelton	60d0bf2a9b	Rename function for clarity	4 years ago
Stephen Shelton	8352de7bd4	Config documentation, clarity	4 years ago
Stephen Shelton	1b19314278	Implement Configuration::generateDefaultConfig(), maintain insertion order	4 years ago
Stephen Shelton	105dd30fd9	More ConfigDefinition unit tests, fixes, support std::string as type	4 years ago
Stephen Shelton	25212b929c	Add ConfigDefinition unit tests, fixes	4 years ago
Stephen Shelton	0fb888890f	First pass at Configuration definition classes	4 years ago
Stephen Shelton	9d71228e74	Replace config visit pattern with explicit lookups ... This is an initial pass at doing explicit value checks when handling config parsing, as opposed to using a visiting pattern. The latter made it difficult to check for conditions such as missing required values, multiple values, etc. It was also generally less readable (think declarative) which further made it difficult to get a grasp for what our actual configuration file requirements were.	4 years ago
Jeff	d3091cf9fc	Merge pull request #1167 from tewinget/tooling ... RouterHive initial PR	4 years ago
Jeff Becker	99c814e6b0	fix dns rebinding vuln in jsonrpc	4 years ago
Thomas Winget	695784b2b6	more hive things ... DHT PubIntroSentEvent some helper functions added to RouterHive (C++ class) as well as RouterHive(Python class) hive.py main() continues to be a testbed for new event types some more internal classes in pybind	4 years ago
Thomas Winget	7e0e8ab7bf	hive.py upgrades, now with more cli args!	4 years ago
Thomas Winget	a58a8c9a61	hive.py now defaults to 1000 relays because f your box. ... also check for error on uv_async_init... may want to `ulimit -Sn $(ulimit -Hn)`...	4 years ago
Thomas Winget	c8c66f0a5f	some refactoring of tooling code, added RCGossipReceivedEvent	4 years ago
Thomas Winget	912e4267e4	I'm a muppet.	4 years ago
Thomas Winget	df0380e746	LRSM RouterEvent, added to hive test and test passes.	4 years ago
Thomas Winget	771d0b4489	hive pytest framework in place (and path build test works)!	4 years ago
Jeff Becker	e3b5fb4dd9	add local publish intro message to send reply down path	4 years ago
Stephen Shelton	deac8e74ea	Remove dead unit tests	4 years ago
Stephen Shelton	6b906de00d	Judicious removal of dead code	4 years ago
Jeff Becker	dea78d2326	change function signature for dht context to exclude time parameter	4 years ago
Jeff Becker	e8f262ba1c	disable flawed unit test	4 years ago
Jeff	a8a6c175fc	Merge pull request #1128 from majestrate/use-std-chrono-2020-02-24 ... make llarp_time_t use std::chrono::milliseconds	4 years ago
Jeff Becker	bf0416cab8	remove Time_t, add operator overload for printing llarp_time_t and add to_json function for serializing llarp_time_t to json	4 years ago
Jason Rhinelander	3bd400f6fe	Fix string_view C++17 compatibility ... string_view was implicitly convertible to std::string, but std::string_view is only explicitly convertible. This makes the `operator std::string` explicit to be more compatible, and re-adds a bunch of explicit string casts to the code where needed. (This also fixes the build if changing the standard to c++17)	4 years ago
Jeff Becker	d2d109e92c	llarp_time_t is now using std::chrono	4 years ago
Jeff Becker	f4520ac920	make decaying hashset use llarp::Time_t and move unit tests to use catch2	4 years ago
Jason Rhinelander	18a2444c50	Add gcc5 workaround for catch2 GENERATE(table ... stdlibc++'s before v6 erroneously have the tuple constructor as explicit, which causes the initializer lists here to fail.	4 years ago
Jason Rhinelander	1232f34f90	Rewrite generate expressions to make clang-7 happy	4 years ago
Jason Rhinelander	0839c16f19	Final abseil purge ... Bye-bye Google Boost.	4 years ago
Jason Rhinelander	46242ba69b	TrimWhiteSpace -> TrimWhitespace ... Fix my dumb initial capitalization choice.	4 years ago
Jason Rhinelander	74d4afad51	Remove metric config parsing	4 years ago
Jason Rhinelander	54186c4a89	Replace absl string_view with string_view from lokimq ... When we add loki-mq has a dependency we can just alias it, but for now it's easier to copy the header than add the whole submodule library.	4 years ago
Jason Rhinelander	561bfe24c0	Add cmake "check" target to run all tests ... Renames the cmake Catch2 test target to "catch" (instead of "check") and adds a "rungtest" for gtest (because the "gtest" target is already taken by the gtest library itself), and then repurposes the "check" target to run both test suite binaries. Also updates the top-level Makefile to do the same thing, except that there the gtest target is just "gtest" instead of "rungtest".	4 years ago
Jason Rhinelander	98c34d995b	De-abseil: Add our own llarp::TrimWhiteSpace ... Adds a TrimWhiteSpace instead of using abseil's. Adds Catch2 tests for it, and also converts the existing str tests to catch (which look much, much nicer than the gtest ones).	4 years ago
Jason Rhinelander	fe61367a87	Vastly simplified llarp::util::memFn ... There is a huge pile of unnecessary machinery here that can be solved with a few lambdas and some member function pointer type deduction.	4 years ago
Jason Rhinelander	b4440094b0	De-abseil, part 2: mutex, locks, (most) time ... - util::Mutex is now a std::shared_timed_mutex, which is capable of exclusive and shared locks. - util::Lock is still present as a std::lock_guard<util::Mutex>. - the locking annotations are preserved, but updated to the latest supported by clang rather than using abseil's older/deprecated ones. - ACQUIRE_LOCK macro is gone since we don't pass mutexes by pointer into locks anymore (WTF abseil). - ReleasableLock is gone. Instead there are now some llarp::util helper methods to obtain unique and/or shared locks: - `auto lock = util::unique_lock(mutex);` gets an RAII-but-also unlockable object (std::unique_lock<T>, with T inferred from `mutex`). - `auto lock = util::shared_lock(mutex);` gets an RAII shared (i.e. "reader") lock of the mutex. - `auto lock = util::unique_locks(mutex1, mutex2, mutex3);` can be used to atomically lock multiple mutexes at once (returning a tuple of the locks). This are templated on the mutex which makes them a bit more flexible than using a concrete type: they can be used for any type of lockable mutex, not only util::Mutex. (Some of the code here uses them for getting locks around a std::mutex). Until C++17, using the RAII types is painfully verbose: ```C++ // pre-C++17 - needing to figure out the mutex type here is annoying: std::unique_lock<util::Mutex> lock(mutex); // pre-C++17 and even more verbose (but at least the type isn't needed): std::unique_lock<decltype(mutex)> lock(mutex); // our compromise: auto lock = util::unique_lock(mutex); // C++17: std::unique_lock lock(mutex); ``` All of these functions will also warn (under gcc or clang) if you discard the return value. You can also do fancy things like `auto l = util::unique_lock(mutex, std::adopt_lock)` (which lets a lock take over an already-locked mutex). - metrics code is gone, which also removes a big pile of code that was only used by metrics: - llarp::util::Scheduler - llarp:🧵:TimerQueue - llarp::util::Stopwatch	4 years ago
Stephen Shelton	16be86a5c3	Merge pull request #1116 from tewinget/short-path-names ... path builder prints hops, rest print short name	4 years ago
Thomas Winget	fc56a018e5	path builder prints hops, rest print short name	4 years ago
Jeff	7c5a721457	Merge pull request #1114 from notlesh/redundant-introset-lookup-improvements-2020-02-20 ... Redundant introset lookup improvements	4 years ago
Stephen Shelton	0429bafbb3	Merge pull request #1111 from notlesh/redundant-introset-propagation-2020-02-19 ... Redundant introset propagation	4 years ago
Stephen Shelton	66cb30fa58	Refactor: remove recursionDepth from DHT lookups	4 years ago
Stephen Shelton	dff9aeb250	Propagate Introset publishing redundantly	4 years ago
Jason Rhinelander	ac1486d0be	Replace absl::optional with optional-lite ... Step 1 of removing abseil from lokinet. For the most part this is a drop-in replacement, but there are also a few changes here to the JSONRPC layer that were needed to work around current gcc 10 dev snapshot: - JSONRPC returns a json now instead of an optional<json>. It doesn't make any sense to have a json rpc call that just closes the connection with returning anything. Invoked functions can return a null (default constructed) result now if they don't have anything to return (such a null value won't be added as "result").	4 years ago
Jeff Becker	827ca0bda7	make catch2 a submodule	4 years ago
Stephen Shelton	7842889fef	Add NodeDB tests around FindClosestTo()	4 years ago
Stephen Shelton	9dfcfbc3ac	Bencode/decode relayOrder in lexigraphical order, make it uint64_t	4 years ago
Stephen Shelton	906803e387	Refactor DHT introset lookups to use redundant lookup strategy	4 years ago
Jeff Becker	e35d17764a	* add path::Path::UniqueEndpointSet_t ... * start using check2 for new unit tests * unit test for path::Path::UniqueEndpointSet_t	4 years ago
Jason Rhinelander	8aacc2d317	Update deprecated gtest macros ... gtest ~renamed INSTANTIATE_TEST_CASE_P to INSTANTIATE_TEST_SUITE_P and added a "backwards compatibility" shim, but the shim fails at compile time if you pass in an empty fourth argument.	4 years ago
Jeff	186dba45cb	Merge pull request #956 from notlesh/km-testing ... Implement KeyManager tests	4 years ago
Jason Rhinelander	0497fb9ccb	Another big-endian fix	4 years ago
Jason Rhinelander	5f642e4f01	Zero-initialize test array	4 years ago
Jeff	8230b1152e	Merge pull request #1072 from majestrate/2020-01-25-router-version ... add router version	4 years ago
Jeff Becker	1318846a08	test/service/test_llarp_service_identity.cpp: ... * remove failing irrelevent test * add expect_call in EnsureKeys to match expected bevahior	4 years ago
Stephen Shelton	8921125924	Fix buffer overflow when version encodes too many integers	4 years ago
Jason Rhinelander	46f3459b79	Fixed EncryptedIntroSet signing to use PrivateKey ... We can generate both root and derived signatures from a PrivateKey, but only root from a SecretKey, so just change it to use a PrivateKey.	4 years ago
Jason Rhinelander	cd8f26deff	Use hash instead of random for signing hash data ... This makes PrivateKey store both the key followed by the hash. For PrivateKeys based on SecretKeys this just means the second half of the SHA-512 of the seed, and makes a PrivateKey constructed from a SecretKey give an identical signature to signing directly with sodium. For derived keys we use a ShortHash of the root key's signing hash concatenated with the publicly known hash value, so that our derived key signing hash will be different from the root signing hash and also different for different derivation parameters. This also changed one of the asserts in crypto_noop, but upon closer inspection the copying of the secret key into the signature seems really wrong, so just changed them to fill with 0s.	4 years ago
Jeff Becker	9153f726c5	const correctness	4 years ago
Stephen Shelton	cfabe72587	Fix RouterVersion::IsEmpty() and RouterVersion::Clear()	4 years ago
Stephen Shelton	f0571a9f2c	Fix IsCompatableWith() logic WRT emptyRouterVersion, add unit tests	4 years ago
Thomas Winget	a487982c49	initial implementation of blinded sign -- not working yet	4 years ago
Jason Rhinelander	860c5efd47	Derived key fixes ... The reason things weren't working here is because libsodium does something completely unintuitive and called the seed the "secret key" when it isn't, it's the seed. This adds a new PrivateKey class (alongside the existing SecretKey and PubKey) that holds just a private key value but no seed -- which we need to do because there is no way we can get a seed after calculating a derived keypair. With these changes, we now generate exactly the same keys and subkeys as Tor (and a new test case uses values generated in Tor to verify this). This is incomplete -- the subkey signing code is still not implemented; it has to be adapted to create a signature from a PrivateKey rather than a SecretKey which will probably requiring working around/reimplementing some of what libsodium does for creating a signature since it expects "secret keys" i.e. the seed.	4 years ago
Jeff Becker	0f13591802	does not work	4 years ago
Jeff Becker	99eb7726ff	initial dht key blinding	4 years ago
Jeff Becker	9efd796145	initial wack at 0.7.0 dht fixes	4 years ago
Jeff Becker	2c0dc12f39	refactor single char variables in DHT (mostly)	4 years ago
Jeff Becker	3b66cf6e75	dht fixes, disable iterative lookups on clients, revert "fixes" from 0.6.3, pass in recursion depth from introset lookup	4 years ago
Stephen Shelton	9a65f19bb0	Add test to ensure config loading impacts runtime log level	4 years ago
Stephen Shelton	43998f97c8	Add unit tests for LogLevelToName and LogLevelToString	4 years ago
Jeff Becker	28752f85b7	improve test cases	4 years ago
Jeff Becker	8d11519eb2	unit tests for logging levels	4 years ago
Rick V	636957f3f9	happy new year	4 years ago
Jeff Becker	562f3f07ab	add unit test for decaying hash set	4 years ago
Jason Rhinelander	1b710455a7	Disallow AlignedBuffer < 8 bytes; add oddball buffer sizes	4 years ago
Jeff Becker	16c7e7dd33	fix unit tests	4 years ago