Minor fixes

stellar · Jul 31, 2024 · 000a6bc · 000a6bc
1 parent efdc609
commit 000a6bc
Show file tree

Hide file tree

Showing 14 changed files with 204 additions and 906 deletions.
diff --git a/Builds/VisualStudio/stellar-core.vcxproj b/Builds/VisualStudio/stellar-core.vcxproj
@@ -873,7 +873,6 @@ exit /b 0
     <ClCompile Include="src\$(Configuration)\generated\xdr\XDRFilesSha256.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\lib\bloom_filter.hpp" />
     <ClInclude Include="..\..\lib\catch.hpp" />
     <ClInclude Include="..\..\lib\clara.hpp" />
     <ClInclude Include="..\..\lib\util\finally.h" />

diff --git a/Builds/VisualStudio/stellar-core.vcxproj.filters b/Builds/VisualStudio/stellar-core.vcxproj.filters
@@ -1754,9 +1754,6 @@
     <ClInclude Include="..\..\src\util\xdrquery\XDRQueryParser.h">
       <Filter>util\xdrquery</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\bloom_filter.hpp">
-      <Filter>lib</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\lib\clara.hpp">
       <Filter>lib</Filter>
     </ClInclude>

diff --git a/COPYING b/COPYING
@@ -46,15 +46,6 @@ lib/binaryfusefilter.h:
   Licensed under the Apache License, Version 2.0
   (<https://www.apache.org/licenses/LICENSE-2.0>)
 
-lib/bloom_filter.hpp:
-
-  The C++ Open Bloom Filter Library,
-  Copyright 2000 Arash Partow
-  (arash at partow dot net)
-  (https://www.partow.net/programming/bloomfilter/index.html)
-  Licensed under the MIT license
-  (http://opensource.org/licenses/MIT)
-
 lib/catch.hpp:
 
   The Catch library,

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,7 @@ members = ["src/rust", "lib/tracy-client-sys"]
 
 [patch.crates-io]
 tracy-client-sys = { path = "lib/tracy-client-sys" }
+stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "ae805d0f8c28ca86327a834eea9ce7d29b0a63bb" }
 
 #[patch."https://github.com/stellar/rs-soroban-env"]
 #soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }
@@ -13,7 +14,6 @@ tracy-client-sys = { path = "lib/tracy-client-sys" }
 # stellar-xdr = { path = "../rs-stellar-xdr/" }
 
 # [patch.crates-io]
-# stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "2775f4b6" }
 # wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "862b32f5" }
 # soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "eda2ab70" }
 # soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "eda2ab70" }