Unverified Commit 7da4edf6 authored by svetaro's avatar svetaro

SKALE-2003 Fix docker test

parent 193cfb6c
...@@ -35,4 +35,4 @@ RUN make ...@@ -35,4 +35,4 @@ RUN make
RUN mkdir /usr/src/sdk/sgx_data RUN mkdir /usr/src/sdk/sgx_data
COPY docker/start.sh ./ COPY docker/start.sh ./
ENTRYPOINT ["/usr/src/sdk/start.sh"] ENTRYPOINT ["/usr/src/sdk/start.sh"]
\ No newline at end of file
...@@ -55,16 +55,21 @@ void create_test_key(){ ...@@ -55,16 +55,21 @@ void create_test_key(){
status = encrypt_key_aes(eid, &errStatus, errMsg.data(),key.c_str(), encrypted_key, &enc_len); status = encrypt_key_aes(eid, &errStatus, errMsg.data(),key.c_str(), encrypted_key, &enc_len);
if ( status != 0){ if ( status != 0){
std::cerr << "encrypt test key failed with status " << status << std::endl;
throw RPCException(status, errMsg.data()) ; throw RPCException(status, errMsg.data()) ;
} }
//std::cerr << "enc len is " << enc_len << std::endl;
vector<char> hexEncrKey(2 * enc_len + 1, 0); vector<char> hexEncrKey(2 * enc_len + 1, 0);
carray2Hex(encrypted_key, enc_len, hexEncrKey.data()); carray2Hex(encrypted_key, enc_len, hexEncrKey.data());
std::cerr << "encr test key is " << std::endl; // std::cerr << "encr test key is " << std::endl;
for (int i = 0; i < 2 * enc_len + 1; i++) // for (int i = 0; i < 2 * enc_len + 1; i++)
std::cerr << (int)hexEncrKey[i] << " "; // std::cerr << (int)hexEncrKey[i] << " ";
LevelDB::getLevelDb() -> writeDataUnique("TEST_KEY", hexEncrKey.data()); LevelDB::getLevelDb() -> writeDataUnique("TEST_KEY", hexEncrKey.data());
} }
...@@ -107,16 +112,17 @@ bool check_SEK(std::string SEK){ ...@@ -107,16 +112,17 @@ bool check_SEK(std::string SEK){
// std::cerr << (int)encr_SEK[i] << " "; // std::cerr << (int)encr_SEK[i] << " ";
// } // }
status = decrypt_key_aes(eid, &err_status, errMsg.data(), encr_test_key.data(), len, decr_key.data()); status = decrypt_key_aes(eid, &err_status, errMsg.data(), encr_test_key.data(), len, decr_key.data());
if (status != 0){ if (status != 0){
spdlog::error("failed to decrypt test key" ); spdlog::error("failed to decrypt test key" );
exit(-1); exit(-1);
} }
std::cerr << "decr test key is " << std::endl; // std::cerr << "decr test key is " << std::endl;
for ( int i = 0; i < BUF_LEN; i++ ){ // for ( int i = 0; i < BUF_LEN; i++ ){
std::cerr << (int)decr_key[i] << " "; // std::cerr << (int)decr_key[i] << " ";
} // }
std::string test_key = TEST_VALUE; std::string test_key = TEST_VALUE;
std::cerr << "test key is " << test_key << std::endl; std::cerr << "test key is " << test_key << std::endl;
...@@ -247,6 +253,6 @@ void init_SEK(){ ...@@ -247,6 +253,6 @@ void init_SEK(){
} }
} }
//ef6fdc31d93f9ec926f64c42278f34cc
//1e6a4c0bcc1ddad3508b7182a0d893d5
...@@ -31,7 +31,7 @@ assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0; ...@@ -31,7 +31,7 @@ assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0;
#assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data", #assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data",
# "-d", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX]) == 0 # "-d", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX]) == 0
obj = subprocess.Popen(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-d","-f","-y","--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX], stdin=subprocess.PIPE, stdout=subprocess.PIPE) obj = subprocess.Popen(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-d","--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-y"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
obj.communicate(input=b"i confirm", timeout=5) obj.communicate(input=b"i confirm", timeout=5)
obj.terminate() obj.terminate()
obj.wait() obj.wait()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment